From 6a28602fa738744deaf29ee931c02193843c43f8 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 4 Feb 2021 12:23:09 -0600 Subject: kernel-5.11.0-0.rc6.20210204git61556703b610.144 * Thu Feb 04 2021 Fedora Kernel Team [5.11.0-0.rc6.20210204git61556703b610.144] - Rename the master branch to rawhide for Fedora (Justin M. Forbes) - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-s390x-debug-fedora.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel-s390x-debug-fedora.config') diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index fdcc1d8fa..2cd169110 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2686,9 +2686,11 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y +# CONFIG_KASAN_GENERIC is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set -CONFIG_KASAN_VMALLOC=y +# CONFIG_KASAN_VMALLOC is not set # CONFIG_KCOV is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KDB_DEFAULT_ENABLE=0x0 @@ -2763,7 +2765,6 @@ CONFIG_KPROBES=y CONFIG_KSM=y CONFIG_KSZ884X_PCI=m # CONFIG_KUNIT is not set -CONFIG_KVM_ARM_PMU=y CONFIG_KVM=m # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KXCJK1013=m @@ -6764,7 +6765,6 @@ CONFIG_VMLOGRDR=m # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set -# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m -- cgit