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-armv7hl-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-armv7hl-fedora.config')
| -rw-r--r-- | kernel-armv7hl-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5c897e759..d876c9416 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1385,7 +1385,6 @@ CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305_ARM=m CONFIG_CRYPTO_POLY1305=m -# CONFIG_CRYPTO_POLY1305_NEON is not set CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -3578,8 +3577,8 @@ CONFIG_LOOPBACK_TARGET=m CONFIG_LP_CONSOLE=y # CONFIG_LPC_SCH is not set CONFIG_LSI_ET1011C_PHY=m +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" CONFIG_LTC1660=m # CONFIG_LTC2471 is not set # CONFIG_LTC2485 is not set @@ -4817,6 +4816,7 @@ CONFIG_NS83820=m CONFIG_NULL_TTY=m CONFIG_NVEC_PAZ00=y CONFIG_NVEC_POWER=y +CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y CONFIG_NVMEM_IMX_IIM=m |