summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-rhel.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-02-04 12:23:09 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-02-04 12:23:09 -0600
commit6a28602fa738744deaf29ee931c02193843c43f8 (patch)
tree3c96216519d1917995b5f1967ba36b77ea479fe9 /kernel-s390x-rhel.config
parent4f1ee1b6a4ea731fa4ff082fa13a449ec0ee9a0e (diff)
downloadkernel-6a28602fa738744deaf29ee931c02193843c43f8.tar.gz
kernel-6a28602fa738744deaf29ee931c02193843c43f8.tar.xz
kernel-6a28602fa738744deaf29ee931c02193843c43f8.zip
kernel-5.11.0-0.rc6.20210204git61556703b610.144kernel-5.11.0-0.rc6.20210204git61556703b610.144.fc32
* Thu Feb 04 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r--kernel-s390x-rhel.config5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index ca836e2ca..1c2e674e7 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2151,7 +2151,6 @@ CONFIG_INTEL_IDXD=m
# CONFIG_INTEL_MEI_HDCP is not set
# CONFIG_INTEL_MEI_TXE is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
-# CONFIG_INTEL_MIC_BUS is not set
CONFIG_INTEL_PCH_THERMAL=m
# CONFIG_INTEL_PMC_CORE is not set
# CONFIG_INTEL_PMC_IPC is not set
@@ -2478,6 +2477,7 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
# CONFIG_KEYS_REQUEST_CACHE is not set
CONFIG_KEYS=y
CONFIG_KGDB_HONOUR_BLOCKLIST=y
@@ -2497,7 +2497,6 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
# CONFIG_KUNIT is not set
CONFIG_KVM_AMD_SEV=y
-CONFIG_KVM_ARM_PMU=y
CONFIG_KVM=m
# CONFIG_KVM_S390_UCONTROL is not set
# CONFIG_KXCJK1013 is not set
@@ -4381,7 +4380,6 @@ CONFIG_SCHEDSTATS=y
# CONFIG_SCHED_THERMAL_PRESSURE is not set
CONFIG_SCHED_TOPOLOGY=y
CONFIG_SCHED_TRACER=y
-# CONFIG_SCIF_BUS is not set
CONFIG_SCLP_ASYNC_ID="000000000"
CONFIG_SCLP_ASYNC=m
CONFIG_SCLP_CONSOLE=y
@@ -6114,7 +6112,6 @@ CONFIG_VMCP=y
CONFIG_VMLOGRDR=m
CONFIG_VMWARE_PVSCSI=m
# CONFIG_VMXNET3 is not set
-# CONFIG_VOP_BUS is not set
CONFIG_VSOCKETS_DIAG=m
CONFIG_VSOCKETS_LOOPBACK=m
CONFIG_VSOCKETS=m