diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-05 05:55:42 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-05 05:55:42 +0100 |
| commit | f2c5e070a9640031f07174d092721bcd5022eb9b (patch) | |
| tree | 725ccb29403d80acfa32da2a1ae3e5bdb772c83b /kernel-s390x-zfcpdump-rhel.config | |
| parent | f458f5b8a94e880216d8194ec2af8a99c9cdedab (diff) | |
| parent | 6a28602fa738744deaf29ee931c02193843c43f8 (diff) | |
| download | kernel-f2c5e070a9640031f07174d092721bcd5022eb9b.tar.gz kernel-f2c5e070a9640031f07174d092721bcd5022eb9b.tar.xz kernel-f2c5e070a9640031f07174d092721bcd5022eb9b.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc6.20210204git61556703b610.144.vanilla.1.fc34kernel-5.11.0-0.rc6.20210204git61556703b610.144.vanilla.1.fc33kernel-5.11.0-0.rc6.20210204git61556703b610.144.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
| -rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ed00e3c73..ec68c7fc8 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2170,7 +2170,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 @@ -2497,6 +2496,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 is not set # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KGDB_HONOUR_BLOCKLIST=y @@ -2516,7 +2516,6 @@ CONFIG_KPROBES=y # CONFIG_KSM is not set # CONFIG_KUNIT is not set CONFIG_KVM_AMD_SEV=y -CONFIG_KVM_ARM_PMU=y # CONFIG_KVM is not set # CONFIG_KVM_S390_UCONTROL is not set # CONFIG_KXCJK1013 is not set @@ -4408,7 +4407,6 @@ CONFIG_SCHED_SMT=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=y CONFIG_SCLP_CONSOLE=y @@ -6150,7 +6148,6 @@ CONFIG_VM_EVENT_COUNTERS=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 is not set CONFIG_VSOCKETS_LOOPBACK=m |