diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-21 16:20:17 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-21 16:20:17 +0200 |
commit | a5a732477e8f527d122f2056ae9e027108ddf73f (patch) | |
tree | 79caffa550588a50dfa86e26b8dbd313e8bff73f /kernel-s390x-zfcpdump-rhel.config | |
parent | 5e24b7da354d3e15954d6c12ec594f66bd7a1d42 (diff) | |
parent | 603ebd7fd9d8b5675a077655ccb58dec49fdf8b0 (diff) | |
download | kernel-a5a732477e8f527d122f2056ae9e027108ddf73f.tar.gz kernel-a5a732477e8f527d122f2056ae9e027108ddf73f.tar.xz kernel-a5a732477e8f527d122f2056ae9e027108ddf73f.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc6.20211021git2f111a6fd5b5.49.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 4a89c5d8b..f1001c7cc 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2114,7 +2114,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -4204,7 +4204,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y # CONFIG_QCOM_QFPROM is not set # CONFIG_QCOM_RMTFS_MEM is not set -# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set # CONFIG_QCOM_SMEM is not set # CONFIG_QCOM_SPMI_IADC is not set |