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 | |
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
32 files changed, 69 insertions, 31 deletions
diff --git a/configs/fedora/debug/CONFIG_TRACE_EVENT_INJECT b/configs/fedora/debug/CONFIG_TRACE_EVENT_INJECT new file mode 100644 index 000000000..6eed5bde6 --- /dev/null +++ b/configs/fedora/debug/CONFIG_TRACE_EVENT_INJECT @@ -0,0 +1 @@ +CONFIG_TRACE_EVENT_INJECT=y diff --git a/configs/fedora/generic/CONFIG_CRYPTO_DEV_AMLOGIC_GXL b/configs/fedora/generic/CONFIG_CRYPTO_DEV_AMLOGIC_GXL index da3c8d8ec..bd9157329 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_DEV_AMLOGIC_GXL +++ b/configs/fedora/generic/CONFIG_CRYPTO_DEV_AMLOGIC_GXL @@ -1 +1 @@ -CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set diff --git a/configs/fedora/generic/x86/CONFIG_DRM_NOUVEAU_SVM b/configs/fedora/generic/CONFIG_DRM_NOUVEAU_SVM index dbd2333b2..dbd2333b2 100644 --- a/configs/fedora/generic/x86/CONFIG_DRM_NOUVEAU_SVM +++ b/configs/fedora/generic/CONFIG_DRM_NOUVEAU_SVM diff --git a/configs/fedora/generic/CONFIG_TRACE_EVENT_INJECT b/configs/fedora/generic/CONFIG_TRACE_EVENT_INJECT new file mode 100644 index 000000000..1c47143cc --- /dev/null +++ b/configs/fedora/generic/CONFIG_TRACE_EVENT_INJECT @@ -0,0 +1 @@ +# CONFIG_TRACE_EVENT_INJECT is not set diff --git a/configs/fedora/generic/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ b/configs/fedora/generic/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ deleted file mode 100644 index 8b76dfa84..000000000 --- a/configs/fedora/generic/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_AMLOGIC_GXL b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_AMLOGIC_GXL new file mode 100644 index 000000000..da3c8d8ec --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_AMLOGIC_GXL @@ -0,0 +1 @@ +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y diff --git a/configs/fedora/generic/CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG index 74c570326..74c570326 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ b/configs/fedora/generic/arm/armv7/CONFIG_ARM_TI_CPUFREQ index ca125040d..ca125040d 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ +++ b/configs/fedora/generic/arm/armv7/CONFIG_ARM_TI_CPUFREQ diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM b/configs/fedora/generic/arm/armv7/CONFIG_PWM_TIEHRPWM index 412fe4734..412fe4734 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM +++ b/configs/fedora/generic/arm/armv7/CONFIG_PWM_TIEHRPWM diff --git a/configs/fedora/generic/arm/armv7/CONFIG_TI_EQEP b/configs/fedora/generic/arm/armv7/CONFIG_TI_EQEP new file mode 100644 index 000000000..0b06827af --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_TI_EQEP @@ -0,0 +1 @@ +CONFIG_TI_EQEP=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_TI_PWMSS b/configs/fedora/generic/arm/armv7/CONFIG_TI_PWMSS new file mode 100644 index 000000000..7e152dd73 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_TI_PWMSS @@ -0,0 +1 @@ +CONFIG_TI_PWMSS=y diff --git a/configs/fedora/generic/powerpc/CONFIG_NVDIMM_DAX b/configs/fedora/generic/powerpc/CONFIG_NVDIMM_DAX new file mode 100644 index 000000000..947636ca8 --- /dev/null +++ b/configs/fedora/generic/powerpc/CONFIG_NVDIMM_DAX @@ -0,0 +1 @@ +CONFIG_NVDIMM_DAX=y diff --git a/configs/fedora/generic/powerpc/CONFIG_NVDIMM_PFN b/configs/fedora/generic/powerpc/CONFIG_NVDIMM_PFN new file mode 100644 index 000000000..9db164ae5 --- /dev/null +++ b/configs/fedora/generic/powerpc/CONFIG_NVDIMM_PFN @@ -0,0 +1 @@ +CONFIG_NVDIMM_PFN=y diff --git a/configs/fedora/generic/powerpc/CONFIG_PPC_UV b/configs/fedora/generic/powerpc/CONFIG_PPC_UV new file mode 100644 index 000000000..5fc95151b --- /dev/null +++ b/configs/fedora/generic/powerpc/CONFIG_PPC_UV @@ -0,0 +1 @@ +CONFIG_PPC_UV=y diff --git a/configs/fedora/generic/powerpc/CONFIG_ZONE_DEVICE b/configs/fedora/generic/powerpc/CONFIG_ZONE_DEVICE index ee4f1b8b2..7d0942fcf 100644 --- a/configs/fedora/generic/powerpc/CONFIG_ZONE_DEVICE +++ b/configs/fedora/generic/powerpc/CONFIG_ZONE_DEVICE @@ -1 +1 @@ -# CONFIG_ZONE_DEVICE is not set +CONFIG_ZONE_DEVICE=y @@ -1 +1 @@ -63de37476ebd1e9bab6a9e17186dc5aa1da9ea99 +2f13437b8917627119d163d62f73e7a78a92303a diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 655b9b0f3..300d92da2 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -334,7 +334,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARMADA_37XX_CPUFREQ=m CONFIG_ARM_ARMADA_8K_CPUFREQ=m -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -1535,6 +1534,7 @@ CONFIG_DRM_MSM=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=m CONFIG_DRM_PANEL_ARM_VERSATILE=m CONFIG_DRM_PANEL_BRIDGE=y @@ -6623,6 +6623,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 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 69f72fd82..9824af89c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -334,7 +334,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARMADA_37XX_CPUFREQ=m CONFIG_ARM_ARMADA_8K_CPUFREQ=m -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -1527,6 +1526,7 @@ CONFIG_DRM_MSM=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=m CONFIG_DRM_PANEL_ARM_VERSATILE=m CONFIG_DRM_PANEL_BRIDGE=y @@ -6601,6 +6601,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 is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index d11496db1..39b542318 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -297,7 +297,6 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=m # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m CONFIG_ARM_BIG_LITTLE_CPUIDLE=y CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -1545,6 +1544,7 @@ CONFIG_DRM_MSM=m CONFIG_DRM_MXSFB=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU_SVM is not set CONFIG_DRM_NXP_PTN3460=m CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m CONFIG_DRM_OMAP_CONNECTOR_HDMI=m @@ -6736,6 +6736,7 @@ CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_EDMA=y CONFIG_TI_EMIF=m CONFIG_TI_EMIF_SRAM=m +CONFIG_TI_EQEP=m CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y @@ -6753,6 +6754,7 @@ CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_PIPE3=m +CONFIG_TI_PWMSS=y # CONFIG_TI_SCI_CLK is not set CONFIG_TI_SCI_PROTOCOL=m CONFIG_TI_SOC_THERMAL=m @@ -6852,6 +6854,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 diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 732ed8bd7..a0535e7bc 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -297,7 +297,6 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=m # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m CONFIG_ARM_BIG_LITTLE_CPUIDLE=y CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -1538,6 +1537,7 @@ CONFIG_DRM_MSM=m CONFIG_DRM_MXSFB=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU_SVM is not set CONFIG_DRM_NXP_PTN3460=m CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m CONFIG_DRM_OMAP_CONNECTOR_HDMI=m @@ -6715,6 +6715,7 @@ CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_EDMA=y CONFIG_TI_EMIF=m CONFIG_TI_EMIF_SRAM=m +CONFIG_TI_EQEP=m CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y @@ -6732,6 +6733,7 @@ CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_PIPE3=m +CONFIG_TI_PWMSS=y # CONFIG_TI_SCI_CLK is not set CONFIG_TI_SCI_PROTOCOL=m CONFIG_TI_SOC_THERMAL=m @@ -6831,6 +6833,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 is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 470079ceb..f34051e37 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -288,7 +288,6 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=m # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m CONFIG_ARM_BIG_LITTLE_CPUIDLE=y CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -361,6 +360,7 @@ CONFIG_ARM_TEGRA124_CPUFREQ=y CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_THUMBEE=y CONFIG_ARM_THUMB=y +CONFIG_ARM_TI_CPUFREQ=y CONFIG_ARM_TIMER_SP804=y CONFIG_ARM_UNWIND=y CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m @@ -1491,6 +1491,7 @@ CONFIG_DRM_MSM_DSI_10NM_PHY=y # 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=m # CONFIG_DRM_OMAP is not set CONFIG_DRM_PANEL_ARM_VERSATILE=m @@ -4710,6 +4711,7 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=y CONFIG_PWM_TIECAP=m +CONFIG_PWM_TIEHRPWM=m CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SD8787=m @@ -6414,6 +6416,7 @@ CONFIG_TI_DAC7311=m # CONFIG_TI_DAC7612 is not set CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_EDMA=y +CONFIG_TI_EQEP=m CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y @@ -6431,6 +6434,7 @@ CONFIG_TIPC_DIAG=m CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TI_PWMSS=y # CONFIG_TI_SCI_CLK is not set CONFIG_TI_SCI_PROTOCOL=m CONFIG_TI_SOC_THERMAL=m @@ -6529,6 +6533,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 diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index e0097f814..f2b62c755 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -288,7 +288,6 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=m # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=m CONFIG_ARM_BIG_LITTLE_CPUIDLE=y CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y @@ -361,6 +360,7 @@ CONFIG_ARM_TEGRA124_CPUFREQ=y CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_THUMBEE=y CONFIG_ARM_THUMB=y +CONFIG_ARM_TI_CPUFREQ=y CONFIG_ARM_TIMER_SP804=y CONFIG_ARM_UNWIND=y CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m @@ -1484,6 +1484,7 @@ CONFIG_DRM_MSM_DSI_10NM_PHY=y # 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=m # CONFIG_DRM_OMAP is not set CONFIG_DRM_PANEL_ARM_VERSATILE=m @@ -4690,6 +4691,7 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=y CONFIG_PWM_TIECAP=m +CONFIG_PWM_TIEHRPWM=m CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SD8787=m @@ -6393,6 +6395,7 @@ CONFIG_TI_DAC7311=m # CONFIG_TI_DAC7612 is not set CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_EDMA=y +CONFIG_TI_EQEP=m CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y @@ -6410,6 +6413,7 @@ CONFIG_TIPC_DIAG=m CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TI_PWMSS=y # CONFIG_TI_SCI_CLK is not set CONFIG_TI_SCI_PROTOCOL=m CONFIG_TI_SOC_THERMAL=m @@ -6508,6 +6512,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 is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 9e3a02690..2762ea22d 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -927,8 +927,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_CRYPTO=m @@ -5969,6 +5968,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TQMX86_WDT=m 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 diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 7769e1244..78b7577b5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -926,8 +926,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_CRYPTO=m @@ -5948,6 +5947,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TQMX86_WDT=m CONFIG_TRACE_EVAL_MAP_FILE=y +# CONFIG_TRACE_EVENT_INJECT is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y 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 diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9182a4249..d33dfbc25 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -859,8 +859,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 @@ -1163,6 +1162,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 @@ -3670,6 +3670,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 @@ -3982,6 +3984,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 @@ -5566,6 +5569,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 is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y @@ -6294,7 +6298,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 diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a87fa4a24..bc424312b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -868,8 +868,7 @@ CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=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 @@ -1180,6 +1179,7 @@ CONFIG_DRM=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y # CONFIG_DRM_NOUVEAU is not set +# 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 @@ -5533,6 +5533,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 diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 509626284..c192e4f26 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -867,8 +867,7 @@ CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=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 @@ -1171,6 +1170,7 @@ CONFIG_DRM=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y # CONFIG_DRM_NOUVEAU is not set +# 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 @@ -5510,6 +5510,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 is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index aa4de5980..48b89c3d4 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -956,8 +956,7 @@ CONFIG_CRYPTO_CURVE25519_X86=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m 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_CRYPTO=m @@ -6023,6 +6022,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TQMX86_WDT=m 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 diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 57d97a964..a28baaadc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -955,8 +955,7 @@ CONFIG_CRYPTO_CURVE25519_X86=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m 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_CRYPTO=m @@ -6002,6 +6001,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS68470_PMIC_OPREGION is not set CONFIG_TQMX86_WDT=m CONFIG_TRACE_EVAL_MAP_FILE=y +# CONFIG_TRACE_EVENT_INJECT is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y diff --git a/kernel.spec b/kernel.spec index 954f9266e..447ce3a23 100644 --- a/kernel.spec +++ b/kernel.spec @@ -112,7 +112,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -474,7 +474,7 @@ Summary: The Linux kernel # We only build kernel-headers on the following... %if 0%{?fedora} -%define nobuildarches i386 +%define nobuildarches i386 ppc64le %else %define nobuildarches i386 i686 %endif @@ -2909,6 +2909,9 @@ fi # # %changelog +* Thu Dec 05 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git6.1 +- Linux v5.4-11747-g2f13437b8917 + * Wed Dec 04 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git5.1 - Linux v5.4-11681-g63de37476ebd @@ -1,2 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.4-git5.xz) = 646ff5c43187c1b34e5a20958f2e70ce1049604623630442e5578ddffb7a9c4715b949e1deed0ac6751e1f4d34d71fe9317c134c4b6d49b38985106fc599b4a4 +SHA512 (patch-5.4-git6.xz) = e3bfdb31b338767b81dbc1a925a87e7c72d76b5c6c233c52044af92cda84e50a5480117e5701ff749fb4c8e738f3eff00a1ac14f66c960a3f9328443d700934d |