diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-26 18:28:06 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-26 18:28:06 +0100 |
| commit | f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b (patch) | |
| tree | 1761b5d6e7fcac9e451a0c74a87846f08de4a67d /kernel-i686-debug-fedora.config | |
| parent | 1b181cf6560defaf1e22033d2d0aa9810f9d9d5e (diff) | |
| parent | c8351b3d7a5401c09a2be72bdf84973c44634245 (diff) | |
| download | kernel-f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b.tar.gz kernel-f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b.tar.xz kernel-f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc35kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc34kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc33kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc32
Diffstat (limited to 'kernel-i686-debug-fedora.config')
| -rw-r--r-- | kernel-i686-debug-fedora.config | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index d7fdfb76a..877ad2689 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1093,14 +1093,11 @@ CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_NHPOLY1305_AVX2=m -CONFIG_CRYPTO_NHPOLY1305_SSE2=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -# CONFIG_CRYPTO_POLY1305_NEON is not set CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -3227,8 +3224,8 @@ CONFIG_LPC_ICH=m CONFIG_LP_CONSOLE=y CONFIG_LPC_SCH=m CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM_MMAP_MIN_ADDR=65535 CONFIG_LTC1660=m # CONFIG_LTC2471 is not set # CONFIG_LTC2485 is not set @@ -4371,6 +4368,7 @@ CONFIG_NSC_GPIO=m # CONFIG_NTFS_FS is not set CONFIG_NULL_TTY=m # CONFIG_NUMA is not set +CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y # CONFIG_NVMEM_REBOOT_MODE is not set |