diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-05 17:08:36 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-05 17:08:36 +0200 |
| commit | 3bb63fa7872e911bdf13d1822719f83310fab24d (patch) | |
| tree | 16cda2d87b087bb35eca65fffed9df1f7e1f9335 /kernel-s390x-zfcpdump-rhel.config | |
| parent | 26eb46adb81a7aad4536e803cbb8b937d1e4d135 (diff) | |
| parent | c918bd768aa916cb376b54354b0753903a1a18b5 (diff) | |
| download | kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.tar.gz kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.tar.xz kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc6.184.vanilla.1.fc35kernel-5.12.0-0.rc6.184.vanilla.1.fc34kernel-5.12.0-0.rc6.184.vanilla.1.fc33kernel-5.12.0-0.rc6.184.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
| -rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a84ccab20..1e0904e18 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y # CONFIG_ARCH_SYNQUACER is not set # CONFIG_ARCNET is not set CONFIG_ARM64_AMU_EXTN=y -CONFIG_ARM64_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y @@ -6261,7 +6260,6 @@ CONFIG_WMI_BMOF=m # CONFIG_X25 is not set CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_X86_IOPL_IOPERM=y -# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m CONFIG_XDP_SOCKETS_DIAG=m |