diff options
24 files changed, 45 insertions, 7 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/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/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 48724ecec..300d92da2 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1534,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 @@ -6622,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 878678c07..9824af89c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1526,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 @@ -6600,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 2a0bebff8..39b542318 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1544,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 @@ -6853,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 9ed1b7219..a0535e7bc 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1537,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 @@ -6832,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 3509757ee..f34051e37 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -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 @@ -6532,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 92c8a66ff..f2b62c755 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -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 @@ -6511,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 e7154fcab..2762ea22d 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5968,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 bed0ed7e4..78b7577b5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5947,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 5316583a3..ba79b178d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1171,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 @@ -3690,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 @@ -4002,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 @@ -5588,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 @@ -6316,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 362623db6..d33dfbc25 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1162,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 @@ -3669,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 @@ -3981,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 @@ -5565,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 @@ -6293,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 0c18544bc..bc424312b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1179,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 @@ -5532,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 ceca4b46e..c192e4f26 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1170,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 @@ -5509,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 b538b3d16..48b89c3d4 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6022,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 acf5176ff..a28baaadc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6001,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 f9a780e5b..6ae9ee5c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,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 @@ -461,7 +461,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 @@ -2889,6 +2889,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 |