diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
commit | 9d8cc94b05933f016a226898842277611bafd566 (patch) | |
tree | 44bd1fc40427c8d932bb2d5bcac9f86b3b1feedc /kernel-x86_64-rhel.config | |
parent | 6243c80866b326be88265a9756403a577110d2d9 (diff) | |
parent | fa13b59d638eb5dd773694de898e8f99d1d85526 (diff) | |
download | kernel-9d8cc94b05933f016a226898842277611bafd566.tar.gz kernel-9d8cc94b05933f016a226898842277611bafd566.tar.xz kernel-9d8cc94b05933f016a226898842277611bafd566.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.1.vanilla.1.fc34kernel-5.9.0-0.rc1.1.vanilla.1.fc33kernel-5.9.0-0.rc1.1.vanilla.1.fc32kernel-5.9.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to 'kernel-x86_64-rhel.config')
-rw-r--r-- | kernel-x86_64-rhel.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index b6b905a14..76a8b53f7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -224,7 +224,6 @@ CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y -CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMC_WATCHDOG is not set # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set @@ -4218,7 +4217,7 @@ CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -CONFIG_RD_ZSTD=y +# CONFIG_RD_ZSTD is not set # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y |