forked from rpms/kernel
kernel-5.11.0-0.rc6.143.el9
* Wed Feb 03 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc6.143] - v5.11-rc6-55-g3aaf0a27ffc2 rebase - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) - kernel.spec.template - fix use_vdso usage (Ben Crocker) - redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED ("Herton R. Krzesinski") - .gitignore: fix previous mismerge with "HEAD line" ("Herton R. Krzesinski") Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
This commit is contained in:
parent
f131743348
commit
cc06b2e288
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 141
|
||||
RHEL_RELEASE = 143
|
||||
|
||||
#
|
||||
# Early y+1 numbering
|
||||
|
@ -1,3 +1,9 @@
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/953791de9ce117c06e258246fde44567c118ba9c
|
||||
953791de9ce117c06e258246fde44567c118ba9c Bluetooth: L2CAP: Try harder to accept device not knowing options
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/035ea4b6c436e53b4c9e388bc65c965f310e216c
|
||||
035ea4b6c436e53b4c9e388bc65c965f310e216c redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/e187313e5f0086538fefe0925ef84480f99616d8
|
||||
e187313e5f0086538fefe0925ef84480f99616d8 gcc-plugins: fix gcc 11 indigestion with plugins...
|
||||
|
||||
|
@ -5563,7 +5563,6 @@ CONFIG_RESET_TI_SYSCON=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4393,7 +4393,6 @@ CONFIG_RETPOLINE=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5540,7 +5540,6 @@ CONFIG_RESET_TI_SYSCON=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4372,7 +4372,6 @@ CONFIG_RETPOLINE=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5692,7 +5692,6 @@ CONFIG_RESET_TI_SYSCON=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5672,7 +5672,6 @@ CONFIG_RESET_TI_SYSCON=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5518,7 +5518,6 @@ CONFIG_RESET_TI_SYSCON=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5498,7 +5498,6 @@ CONFIG_RESET_TI_SYSCON=m
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4999,7 +4999,6 @@ CONFIG_RETPOLINE=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4979,7 +4979,6 @@ CONFIG_RETPOLINE=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4680,7 +4680,6 @@ CONFIG_REMOTEPROC=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4240,7 +4240,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4659,7 +4659,6 @@ CONFIG_REMOTEPROC=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4223,7 +4223,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4614,7 +4614,6 @@ CONFIG_REMOTEPROC=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4177,7 +4177,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4593,7 +4593,6 @@ CONFIG_REMOTEPROC=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4160,7 +4160,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4184,7 +4184,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
# CONFIG_RFKILL is not set
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5044,7 +5044,6 @@ CONFIG_RETPOLINE=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4395,7 +4395,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -5022,7 +5022,6 @@ CONFIG_RETPOLINE=y
|
||||
CONFIG_RFKILL_GPIO=m
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
# CONFIG_RH_DISABLE_DEPRECATED is not set
|
||||
# CONFIG_RHEL_DIFFERENCES is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
@ -4375,7 +4375,6 @@ CONFIG_RETPOLINE=y
|
||||
# CONFIG_RFKILL_GPIO is not set
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL=m
|
||||
CONFIG_RH_DISABLE_DEPRECATED=y
|
||||
CONFIG_RHEL_DIFFERENCES=y
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
|
30
kernel.spec
30
kernel.spec
@ -64,7 +64,7 @@ Summary: The Linux kernel
|
||||
# For a stable, released kernel, released_kernel should be 1.
|
||||
%global released_kernel 0
|
||||
|
||||
%global distro_build 0.rc6.141
|
||||
%global distro_build 0.rc6.143
|
||||
|
||||
%if 0%{?fedora}
|
||||
%define secure_boot_arch x86_64
|
||||
@ -105,13 +105,13 @@ Summary: The Linux kernel
|
||||
%endif
|
||||
|
||||
%define rpmversion 5.11.0
|
||||
%define pkgrelease 0.rc6.141
|
||||
%define pkgrelease 0.rc6.143
|
||||
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 11
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc6.141%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc6.143%{?buildid}%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}
|
||||
|
||||
@ -466,7 +466,7 @@ Summary: The Linux kernel
|
||||
%define cpupowerarchs i686 x86_64 ppc64le aarch64
|
||||
%endif
|
||||
|
||||
%if %{use_vdso}
|
||||
%if 0%{?use_vdso}
|
||||
|
||||
%if 0%{?skip_nonpae_vdso}
|
||||
%define _use_vdso 0
|
||||
@ -601,7 +601,7 @@ BuildRequires: asciidoc
|
||||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.11.0-0.rc6.141.tar.xz
|
||||
Source0: linux-5.11.0-0.rc6.143.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
@ -1246,8 +1246,8 @@ ApplyOptionalPatch()
|
||||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.11.0-0.rc6.141 -c
|
||||
mv linux-5.11.0-0.rc6.141 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.11.0-0.rc6.143 -c
|
||||
mv linux-5.11.0-0.rc6.143 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
@ -2736,11 +2736,21 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Feb 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.141]
|
||||
- v5.11-rc6 rebase
|
||||
* Wed Feb 03 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc6.143]
|
||||
- v5.11-rc6-55-g3aaf0a27ffc2 rebase
|
||||
|
||||
* Wed Feb 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210203git3aaf0a27ffc2.143]
|
||||
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
|
||||
|
||||
* Wed Feb 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210203git3aaf0a27ffc2.142]
|
||||
- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski)
|
||||
- redhat: add genlog.py script (Herton R. Krzesinski)
|
||||
- Turn off vdso_install for ppc (Justin M. Forbes)
|
||||
- kernel.spec.template - fix use_vdso usage (Ben Crocker)
|
||||
|
||||
* Tue Feb 02 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210202git88bb507a74ea.141]
|
||||
- redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED ("Herton R. Krzesinski")
|
||||
- .gitignore: fix previous mismerge with "HEAD line" ("Herton R. Krzesinski")
|
||||
- Turn off vdso_install for ppc ("Justin M. Forbes")
|
||||
|
||||
* Sun Jan 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210131git0e9bcda5d286.139]
|
||||
- Remove bpf-helpers.7 from bpftool package (Jiri Olsa)
|
||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-5.11.0-0.rc6.141.tar.xz) = 31ceb511b050b00534fdef008e4bc833a3bab6b3427c5110c10d242fa1f7cbbb31eeddf90603da8e5034f58ecbc53cc61276260b5b956b06cfb310d42ad2fb3d
|
||||
SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.141.tar.bz2) = d638cd506edbdaa66003c3be8b389932fccccd75709d4ac5d94d1ecf533481b8d0bbb9a5fcfdd0223671ffa8f8f57b6818976bbd1920a11fa774ccee3750193b
|
||||
SHA512 (kernel-kabi-dw-5.11.0-0.rc6.141.tar.bz2) = 266dbd0334db42f1a2ea5a42640402a5626e0813dc3f6f0b60826d48a088556fca6502b7dff7a217191b36bc09170617e84812bb3e9d06a96b006194309959aa
|
||||
SHA512 (linux-5.11.0-0.rc6.143.tar.xz) = 9c1cf939736f67189d5844b0c95b01b3395fde911a342bc2662db518b41092c82f7c6e8344fce19a583eab6f8dbfb477858ae576ee01d5723cd27f9703466f46
|
||||
SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.143.tar.bz2) = 04d34434615edc9f2634ff5278e55ca9e2211082abd0e4a852fb29981b3c8ea191d49d047e2307616efaaac620286faa18aad9832c918d27af2c6cec1475eec4
|
||||
SHA512 (kernel-kabi-dw-5.11.0-0.rc6.143.tar.bz2) = 72368a6ebecab00c3905f344af4a4b86f965ae60b649c901b566ba37621622913377251e5c698ab3f91d7cfe6b77d573c0a0c2c36192953e989b615d292aee3a
|
||||
|
Loading…
Reference in New Issue
Block a user