diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-05 18:23:56 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-05 18:23:56 +0100 |
commit | 889961e7d1825ddabd68eaa9ea87e8700cb14783 (patch) | |
tree | b4b3a46eba33e775c691c90a4993a5d88faad302 /kernel-ppc64le-debug-fedora.config | |
parent | f1eff899041d03a2a65502bc7dc965965f0c8dd9 (diff) | |
parent | 3c594e0587fa25d240477860c4711b8ffd035d88 (diff) | |
download | kernel-889961e7d1825ddabd68eaa9ea87e8700cb14783.tar.gz kernel-889961e7d1825ddabd68eaa9ea87e8700cb14783.tar.xz kernel-889961e7d1825ddabd68eaa9ea87e8700cb14783.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git6.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git6.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-ppc64le-debug-fedora.config')
-rw-r--r-- | kernel-ppc64le-debug-fedora.config | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 5d1dc6cf9..ba79b178d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -860,8 +860,7 @@ CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set -CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set @@ -1172,6 +1171,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU_SVM is not set # CONFIG_DRM_NXP_PTN3460 is not set CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m @@ -3691,6 +3691,8 @@ CONFIG_NULL_TTY=m CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA=y +CONFIG_NVDIMM_DAX=y +CONFIG_NVDIMM_PFN=y CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y # CONFIG_NVMEM_REBOOT_MODE is not set @@ -4003,6 +4005,7 @@ CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y CONFIG_PPC_SVM=y CONFIG_PPC_TRANSACTIONAL_MEM=y +CONFIG_PPC_UV=y CONFIG_PPC_VAS=y CONFIG_PPC=y CONFIG_PPDEV=m @@ -5589,6 +5592,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS6507X is not set # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TRACE_EVAL_MAP_FILE=y +CONFIG_TRACE_EVENT_INJECT=y # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y @@ -6317,7 +6321,7 @@ CONFIG_ZEROPLUS_FF=y CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONE_DEVICE is not set +CONFIG_ZONE_DEVICE=y CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set CONFIG_ZRAM=m |