rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.11.0-0.rc6.20210203git3aaf0a27ffc2.143

Browse Source 
* 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)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-02-03 13:00:55 -06:00
parent 799a651edc
commit 4f1ee1b6a4
28 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -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

6
Patchlist.changelog
View File

@ -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...

1
kernel-aarch64-debug-fedora.config
View File

@ -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

1
kernel-aarch64-debug-rhel.config
View File

@ -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

1
kernel-aarch64-fedora.config
View File

@ -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

1
kernel-aarch64-rhel.config
View File

@ -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

1
kernel-armv7hl-debug-fedora.config
View File

@ -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

1
kernel-armv7hl-fedora.config
View File

@ -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

1
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -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

1
kernel-armv7hl-lpae-fedora.config
View File

@ -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

1
kernel-i686-debug-fedora.config
View File

@ -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

1
kernel-i686-fedora.config
View File

@ -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

1
kernel-ppc64le-debug-fedora.config
View File

@ -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

1
kernel-ppc64le-debug-rhel.config
View File

@ -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

1
kernel-ppc64le-fedora.config
View File

@ -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

1
kernel-ppc64le-rhel.config
View File

@ -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

1
kernel-s390x-debug-fedora.config
View File

@ -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

1
kernel-s390x-debug-rhel.config
View File

@ -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

1
kernel-s390x-fedora.config
View File

@ -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

1
kernel-s390x-rhel.config
View File

@ -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

1
kernel-s390x-zfcpdump-rhel.config
View File

@ -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

1
kernel-x86_64-debug-fedora.config
View File

@ -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

1
kernel-x86_64-debug-rhel.config
View File

@ -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

1
kernel-x86_64-fedora.config
View File

@ -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

1
kernel-x86_64-rhel.config
View File

@ -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

28
kernel.spec
View File

@ -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.20210203git3aaf0a27ffc2.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.20210203git3aaf0a27ffc2.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.20210203git3aaf0a27ffc2.143%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@ -201,7 +201,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
%define debugbuildsenabled 1
%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.11
@ -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-rc6.tar.xz
Source0: linux-20210203git3aaf0a27ffc2.tar.xz
Source1: Makefile.rhelver
@ -1246,8 +1246,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-5.11-rc6 -c
mv linux-5.11-rc6 linux-%{KVERREL}
%setup -q -n kernel-20210203git3aaf0a27ffc2 -c
mv linux-20210203git3aaf0a27ffc2 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -2736,10 +2736,18 @@ fi
#
#
%changelog
* Mon Feb 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.141]
* 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)

22
patch-5.11.0-redhat.patch
View File

@ -54,7 +54,7 @@
include/linux/rh_kabi.h | 297 +++++++++++++++++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
kernel/Makefile | 2 +
kernel/Makefile | 1 +
kernel/bpf/syscall.c | 27 +-
kernel/crash_core.c | 28 +-
kernel/module.c | 2 +
@ -62,13 +62,14 @@
kernel/panic.c | 14 +
kernel/rh_taint.c | 93 ++++++
mm/kmemleak.c | 5 +
net/bluetooth/l2cap_core.c | 1 +
scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +-
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
70 files changed, 1580 insertions(+), 188 deletions(-)
71 files changed, 1580 insertions(+), 188 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@ -2638,14 +2639,13 @@ index c35ea0ffccd9..342d4579bf5c 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/kernel/Makefile b/kernel/Makefile
index aa7368c7eabf..59724bef4bf2 100644
index aa7368c7eabf..2700b4c4ca0a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -12,6 +12,8 @@ obj-y = fork.o exec_domain.o panic.o \
@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \
notifier.o ksysfs.o cred.o reboot.o \
async.o range.o smpboot.o ucount.o regset.o
+obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o
+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o
obj-$(CONFIG_USERMODE_DRIVER) += usermode_driver.o
obj-$(CONFIG_MODULES) += kmod.o
@ -2953,6 +2953,18 @@ index c0014d3b91c1..c00e9820412a 100644
kmemleak_initialized = 1;
debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 17b87b57a175..ad1524a3b49c 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4519,6 +4519,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,
}
goto done;
+ case L2CAP_CONF_UNKNOWN:
case L2CAP_CONF_UNACCEPT:
if (chan->num_conf_rsp <= L2CAP_CONF_MAX_CONF_RSP) {
char req[64];
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index d6c81657d695..c70e5904b7bc 100644
--- a/scripts/mod/modpost.c

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.11-rc6.tar.xz) = fd40c54ef8e98edde6469ad927c42e658e1650337a7ffe47e9e043fe9c45e30dea4e469342d4d90d893eb09f91f8881db793330858acb260de558a74455d5476
SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.141.tar.bz2) = 5082588f5d3dbffb7b6370fe1111181b503c157d461b346b8461fb1cbf8e9aad4ce42f43c9e0e7d159a46ce6d8f38c567821bc3c3552a8bfb45a1a089b8cdab1
SHA512 (kernel-kabi-dw-5.11.0-0.rc6.141.tar.bz2) = 902650dbe71f6400d053973fe8d3c9b23f7fb53d336013cf95575bc425b52bc886c91ffc5d7e0fcf50cd891fef13dec6a5db94afab5448d7424d49af70f636e3
SHA512 (linux-20210203git3aaf0a27ffc2.tar.xz) = 90c9974dacc42a7f3e81c783f50b202ccc4dcebc2abe97083569be378e4c5f024d5ddaecacedc79cde90e7c0af1620dc9c0a99527473f74633a49f17cb15f981
SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.20210203git3aaf0a27ffc2.143.tar.bz2) = 09881ee4f5aab41375840bcd6ceff64064518615402f29e1b51d0de7f762f635a70527e5b9b763591ed00ceb83f9dcff8ef9bc0d722bb6950beb15b518232906
SHA512 (kernel-kabi-dw-5.11.0-0.rc6.20210203git3aaf0a27ffc2.143.tar.bz2) = 20019663d773b2680fc80b000ddaa8b54ff51384874a074979fbb6026bc9f21f388236c26bbcb387f2f7c54c6c16af8c5b916526bb372a856556c372d4d6a732