diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-08 08:03:32 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-08 08:03:32 +0200 |
| commit | 8331bd9c45cea3b4964b0a5fa301b375683fe103 (patch) | |
| tree | 3b3dc12efe463a38ac1fe43fce4fe96efb1dffff /kernel-aarch64-fedora.config | |
| parent | ea76eb012e00670a95288a24263d4f29e06b266f (diff) | |
| parent | 7ab3430578bb44245900b015eefd4644be051cfe (diff) | |
| download | kernel-8331bd9c45cea3b4964b0a5fa301b375683fe103.tar.gz kernel-8331bd9c45cea3b4964b0a5fa301b375683fe103.tar.xz kernel-8331bd9c45cea3b4964b0a5fa301b375683fe103.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc0.20210707git77d34a4683b0.12.vanilla.1.fc35kernel-5.14.0-0.rc0.20210707git77d34a4683b0.12.vanilla.1.fc34kernel-5.14.0-0.rc0.20210707git77d34a4683b0.12.vanilla.1.fc33
Diffstat (limited to 'kernel-aarch64-fedora.config')
| -rw-r--r-- | kernel-aarch64-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index db58b7476..0e7c18f4d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2826,7 +2826,7 @@ CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_MODSIG=y CONFIG_IMA_APPRAISE=y -# CONFIG_IMA_ARCH_POLICY is not set +CONFIG_IMA_ARCH_POLICY=y # CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set CONFIG_IMA_DEFAULT_HASH="sha256" @@ -3972,7 +3972,7 @@ CONFIG_MLX5_VDPA=y CONFIG_MLX90614=m CONFIG_MLX90632=m CONFIG_MLXBF_BOOTCTL=m -# CONFIG_MLXBF_GIGE is not set +CONFIG_MLXBF_GIGE=m # CONFIG_MLXBF_PMC is not set CONFIG_MLXBF_TMFIFO=m CONFIG_MLXFW=m |