From 37444a667978d0c9faebd34834312cd92a25c89b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 12 Jul 2021 09:23:35 -0500 Subject: kernel-5.14.0-0.rc0.20210709gitf55966571d5e.13 * Fri Jul 09 2021 Fedora Kernel Team [5.14.0-0.rc0.20210709gitf55966571d5e.13] - redhat/configs: enable KEXEC_SIG which is already enabled in RHEL8 for s390x and x86_64 (Coiby Xu) [1976835] Resolves: rhbz#1976835 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 -- kernel-aarch64-debug-fedora.config | 4 ++ kernel-aarch64-debug-rhel.config | 3 ++ kernel-aarch64-fedora.config | 4 ++ kernel-aarch64-rhel.config | 3 ++ kernel-armv7hl-debug-fedora.config | 4 ++ kernel-armv7hl-fedora.config | 4 ++ kernel-armv7hl-lpae-debug-fedora.config | 4 ++ kernel-armv7hl-lpae-fedora.config | 4 ++ kernel-i686-debug-fedora.config | 4 ++ kernel-i686-fedora.config | 4 ++ kernel-ppc64le-debug-fedora.config | 4 ++ kernel-ppc64le-debug-rhel.config | 3 ++ kernel-ppc64le-fedora.config | 4 ++ kernel-ppc64le-rhel.config | 3 ++ kernel-s390x-debug-fedora.config | 4 ++ kernel-s390x-debug-rhel.config | 3 ++ kernel-s390x-fedora.config | 4 ++ kernel-s390x-rhel.config | 3 ++ kernel-s390x-zfcpdump-rhel.config | 5 +- kernel-x86_64-debug-fedora.config | 4 ++ kernel-x86_64-debug-rhel.config | 3 ++ kernel-x86_64-fedora.config | 4 ++ kernel-x86_64-rhel.config | 3 ++ kernel.spec | 17 +++---- patch-5.14.0-redhat.patch | 84 +++++++++++---------------------- sources | 6 +-- 28 files changed, 123 insertions(+), 74 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e4f22ec46..98f70a2f0 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 14 +RHEL_RELEASE = 16 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index c2ce1f549..e354012ff 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/6f5d7fac6e5ad971605ac27a4fb92940d95406b4 - 6f5d7fac6e5ad971605ac27a4fb92940d95406b4 Fix the perf trace link location - https://gitlab.com/cki-project/kernel-ark/-/commit/c86a777b719e3777a9663a13a739840fb48a20ef c86a777b719e3777a9663a13a739840fb48a20ef Revert "kdump: add support for crashkernel=auto" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f504e84ab..f7451a4b6 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -384,6 +384,7 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_ARM_DMA_USE_IOMMU=y # CONFIG_ARM_DMC620_PMU is not set CONFIG_ARM_DSU_PMU=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y @@ -5071,6 +5072,7 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_PEM=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y CONFIG_PCI_KEYSTONE_HOST=y CONFIG_PCI_LAYERSCAPE=y @@ -5732,6 +5734,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_RESET_HISI=y CONFIG_RESET_IMX7=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_MESON=m CONFIG_RESET_QCOM_AOSS=y @@ -7167,6 +7170,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 7be37ef2a..7553d6483 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -300,6 +300,7 @@ CONFIG_ARM_CMN=m CONFIG_ARM_CPUIDLE=y CONFIG_ARM_DMC620_PMU=m CONFIG_ARM_DSU_PMU=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_MHU=m # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PMU=y @@ -4563,6 +4564,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set CONFIG_RESET_SCMI=y @@ -5704,6 +5706,7 @@ CONFIG_SQUASHFS_ZLIB=y CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 76f435fa9..967d90570 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -384,6 +384,7 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_ARM_DMA_USE_IOMMU=y # CONFIG_ARM_DMC620_PMU is not set CONFIG_ARM_DSU_PMU=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y @@ -5048,6 +5049,7 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_PEM=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y CONFIG_PCI_KEYSTONE_HOST=y CONFIG_PCI_LAYERSCAPE=y @@ -5709,6 +5711,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_RESET_HISI=y CONFIG_RESET_IMX7=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_MESON=m CONFIG_RESET_QCOM_AOSS=y @@ -7142,6 +7145,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d44033d91..3493a3386 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -300,6 +300,7 @@ CONFIG_ARM_CMN=m CONFIG_ARM_CPUIDLE=y CONFIG_ARM_DMC620_PMU=m CONFIG_ARM_DSU_PMU=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_MHU=m # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PMU=y @@ -4542,6 +4543,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set CONFIG_RESET_SCMI=y @@ -5681,6 +5683,7 @@ CONFIG_SQUASHFS_ZLIB=y CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f73eaf6ee..c4462f1e4 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -386,6 +386,7 @@ CONFIG_ARM_ERRATA_857271=y CONFIG_ARM_ERRATA_857272=y CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m CONFIG_ARM_EXYNOS_CPUIDLE=y +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y @@ -5170,6 +5171,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y CONFIG_PCI_KEYSTONE_HOST=y # CONFIG_PCI_LAYERSCAPE is not set @@ -5850,6 +5852,7 @@ CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_IMX7=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_MESON=m # CONFIG_RESET_QCOM_AOSS is not set @@ -7372,6 +7375,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index f1f30e0d2..670f2e406 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -386,6 +386,7 @@ CONFIG_ARM_ERRATA_857271=y CONFIG_ARM_ERRATA_857272=y CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m CONFIG_ARM_EXYNOS_CPUIDLE=y +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y @@ -5148,6 +5149,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y CONFIG_PCI_KEYSTONE_HOST=y # CONFIG_PCI_LAYERSCAPE is not set @@ -5828,6 +5830,7 @@ CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_IMX7=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_MESON=m # CONFIG_RESET_QCOM_AOSS is not set @@ -7348,6 +7351,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 370eefcfa..92871ecde 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -378,6 +378,7 @@ CONFIG_ARM_ERRATA_857271=y CONFIG_ARM_ERRATA_857272=y CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m CONFIG_ARM_EXYNOS_CPUIDLE=y +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y @@ -5055,6 +5056,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y CONFIG_PCI_KEYSTONE_HOST=y CONFIG_PCI_KEYSTONE=y @@ -5674,6 +5676,7 @@ CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_IMX7=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_MESON=m # CONFIG_RESET_QCOM_AOSS is not set @@ -7133,6 +7136,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index cdb6be925..012894187 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -378,6 +378,7 @@ CONFIG_ARM_ERRATA_857271=y CONFIG_ARM_ERRATA_857272=y CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m CONFIG_ARM_EXYNOS_CPUIDLE=y +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GIC_PM=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3_ITS=y @@ -5033,6 +5034,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y CONFIG_PCI_KEYSTONE_HOST=y CONFIG_PCI_KEYSTONE=y @@ -5652,6 +5654,7 @@ CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_IMX7=y # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_MESON=m # CONFIG_RESET_QCOM_AOSS is not set @@ -7109,6 +7112,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index a0ad42984..154cd5357 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4650,6 +4651,7 @@ CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MMCONFIG=y @@ -5143,6 +5145,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y # CONFIG_RFD77402 is not set @@ -6450,6 +6453,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index b3bdd4cd4..d7626f3bd 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4628,6 +4629,7 @@ CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MMCONFIG=y @@ -5121,6 +5123,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y # CONFIG_RFD77402 is not set @@ -6426,6 +6429,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 08ca6088d..b12a1ec61 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -248,6 +248,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4348,6 +4349,7 @@ CONFIG_PCIE_XILINX_CPM=y CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -4832,6 +4834,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set @@ -6055,6 +6058,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 967c0e1b6..acbe6977d 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -209,6 +209,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4356,6 +4357,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5483,6 +5485,7 @@ CONFIG_SQUASHFS_ZLIB=y CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 8f0b1b41a..468a6eda9 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -248,6 +248,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4325,6 +4326,7 @@ CONFIG_PCIE_XILINX_CPM=y CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -4809,6 +4811,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set @@ -6030,6 +6033,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 8b379964b..0b7756f15 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -209,6 +209,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4339,6 +4340,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5464,6 +5466,7 @@ CONFIG_SQUASHFS_ZLIB=y CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 96823ac7a..03166eb5b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -252,6 +252,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4326,6 +4327,7 @@ CONFIG_PCIE_XILINX_CPM=y CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -4780,6 +4782,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set @@ -6007,6 +6010,7 @@ CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index e56817acf..2019eb5cc 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -209,6 +209,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4297,6 +4298,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5430,6 +5432,7 @@ CONFIG_STACK_GUARD=256 CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index fceaaff1e..e8c79c229 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -252,6 +252,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4303,6 +4304,7 @@ CONFIG_PCIE_XILINX_CPM=y CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -4757,6 +4759,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set @@ -5982,6 +5985,7 @@ CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d0e9f60f8..1663e315f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -209,6 +209,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4280,6 +4281,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5411,6 +5413,7 @@ CONFIG_STACK_GUARD=256 CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 40575d482..9be7db6e8 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -209,6 +209,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4303,6 +4304,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5440,9 +5442,10 @@ CONFIG_STACK_GUARD=256 CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y -# CONFIG_STACKTRACE is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACKTRACE_SUPPORT=y +CONFIG_STACKTRACE=y # CONFIG_STAGING is not set # CONFIG_STAGING_MEDIA is not set CONFIG_STANDALONE=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 016b41599..74051b237 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -287,6 +287,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4694,6 +4695,7 @@ CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MMCONFIG=y @@ -5187,6 +5189,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y # CONFIG_RFD77402 is not set @@ -6504,6 +6507,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 37be326b8..bcb3b3f28 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -233,6 +233,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4538,6 +4539,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5712,6 +5714,7 @@ CONFIG_SQUASHFS_ZLIB=y CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 5198c216a..4f409b0b1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -287,6 +287,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2 # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y @@ -4672,6 +4673,7 @@ CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y +# CONFIG_PCI_IXP4XX is not set CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MMCONFIG=y @@ -5165,6 +5167,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y # CONFIG_RFD77402 is not set @@ -6480,6 +6483,7 @@ CONFIG_STACKLEAK_RUNTIME_DISABLE=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 2f15e1afa..c78f862c2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -233,6 +233,7 @@ CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m +# CONFIG_ARM_FFA_TRANSPORT is not set # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -4518,6 +4519,7 @@ CONFIG_RENESAS_PHY=m # CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_INTEL_GW is not set +# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5690,6 +5692,7 @@ CONFIG_SQUASHFS_ZLIB=y CONFIG_STACK_HASH_ORDER=20 CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING is not set diff --git a/kernel.spec b/kernel.spec index 855c21a10..d0912b940 100755 --- a/kernel.spec +++ b/kernel.spec @@ -71,9 +71,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc0.20210709gitf55966571d5e.14 +%global distro_build 0.rc1.16 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -117,13 +117,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc0.20210709gitf55966571d5e.14 +%define pkgrelease 0.rc1.16 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210709gitf55966571d5e.14%{?buildid}%{?dist} +%define specrelease 0.rc1.16%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -655,7 +655,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-12377-gf55966571d5e.tar.xz +Source0: linux-5.14-rc1.tar.xz Source1: Makefile.rhelver @@ -1340,8 +1340,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-12377-gf55966571d5e -c -mv linux-5.13-12377-gf55966571d5e linux-%{KVERREL} +%setup -q -n kernel-5.14-rc1 -c +mv linux-5.14-rc1 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2922,9 +2922,6 @@ fi # # %changelog -* Fri Jul 09 2021 Fedora Kernel Team [5.14.0-0.rc0.20210709gitf55966571d5e.14] -- Fix the perf trace link location (Justin M. Forbes) - * Fri Jul 09 2021 Fedora Kernel Team [5.14.0-0.rc0.20210709gitf55966571d5e.13] - redhat/configs: enable KEXEC_SIG which is already enabled in RHEL8 for s390x and x86_64 (Coiby Xu) [1976835] diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch index dbed01158..46df63e31 100644 --- a/patch-5.14.0-redhat.patch +++ b/patch-5.14.0-redhat.patch @@ -4,7 +4,6 @@ Makefile | 13 +- arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- arch/arm64/kernel/acpi.c | 4 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + @@ -70,7 +69,6 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - tools/perf/Makefile.perf | 2 +- tools/testing/selftests/bpf/Makefile | 1 - .../selftests/bpf/prog_tests/linked_funcs.c | 42 -- .../testing/selftests/bpf/prog_tests/linked_maps.c | 30 -- @@ -84,7 +82,7 @@ tools/testing/selftests/bpf/progs/linked_maps2.c | 76 --- tools/testing/selftests/bpf/progs/linked_vars1.c | 54 -- tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- - 86 files changed, 1180 insertions(+), 1494 deletions(-) + 84 files changed, 1178 insertions(+), 1492 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index bdb22006f713..61a3a4a4730b 100644 @@ -140,7 +138,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 88888fff4c62..acbf3a56af4e 100644 +index c3f9bd191b89..e3c43232203c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -154,7 +152,7 @@ index 88888fff4c62..acbf3a56af4e 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -503,6 +507,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -508,6 +512,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ @@ -162,7 +160,7 @@ index 88888fff4c62..acbf3a56af4e 100644 -Werror=return-type -Wno-format-security \ -std=gnu89 KBUILD_CPPFLAGS := -D__KERNEL__ -@@ -1299,7 +1304,13 @@ define filechk_version.h +@@ -1256,7 +1261,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -178,10 +176,10 @@ index 88888fff4c62..acbf3a56af4e 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 06b6187b67af..ba742b2f40b1 100644 +index 3ea1c417339f..a52069686c33 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1479,9 +1479,9 @@ config HIGHMEM +@@ -1480,9 +1480,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -214,19 +212,6 @@ index e07e7de9ac49..65aa88fad60d 100644 default "12" if ARM64_16K_PAGES default "11" help -diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 634a91af8e83..4b854eb21f72 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -227,7 +227,7 @@ pcie0: pcie@f8000000 { - <&pcie_phy 2>, <&pcie_phy 3>; - phy-names = "pcie-phy-0", "pcie-phy-1", - "pcie-phy-2", "pcie-phy-3"; -- ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, -+ ranges = <0x82000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, - <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>; - resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, - <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>, diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index f3851724fe35..ef69eeab6f2a 100644 --- a/arch/arm64/kernel/acpi.c @@ -269,7 +254,7 @@ index 50e2c21e0ec9..5da0c683df8d 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index b58ee83f30e3..66e08b5d86d3 100644 +index ff0f9e838916..557318323664 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -280,7 +265,7 @@ index b58ee83f30e3..66e08b5d86d3 100644 #include #include -@@ -1022,6 +1023,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1023,6 +1024,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -303,7 +288,7 @@ index 64b805bd6a54..e6702f1e1beb 100644 setup_force_cpu_cap(X86_FEATURE_CPUID); cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 9f1d9215a9fb..af9eea013e0f 100644 +index bff3a784aec5..1a9c345f914d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -19,6 +19,7 @@ @@ -373,7 +358,7 @@ index 9f1d9215a9fb..af9eea013e0f 100644 /* * Dump out kernel offset information on panic. */ -@@ -939,6 +985,13 @@ void __init setup_arch(char **cmdline_p) +@@ -936,6 +982,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -387,7 +372,7 @@ index 9f1d9215a9fb..af9eea013e0f 100644 dmi_setup(); /* -@@ -1104,19 +1157,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1101,19 +1154,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -408,7 +393,7 @@ index 9f1d9215a9fb..af9eea013e0f 100644 reserve_initrd(); -@@ -1229,6 +1270,8 @@ void __init setup_arch(char **cmdline_p) +@@ -1226,6 +1267,8 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -1314,7 +1299,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 80c656dcbbac..a6bf1b947d49 100644 +index 11779be42186..3aeb87c94cfb 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -261,6 +261,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1428,7 +1413,7 @@ index 0ea5298469c3..94538b576977 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 75420ceacc10..617e130e9377 100644 +index 18ef8dd03a90..5cc86f4ca4be 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -706,6 +706,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -1552,10 +1537,10 @@ index 3168915adaa7..71b48e29b708 100644 { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 310b801c6c87..6fe4affc034f 100644 +index e70f69f791db..dc54f0321fab 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c -@@ -370,11 +370,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) +@@ -369,11 +369,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) /*------------------- PCI Driver operations and data ----------------- */ static const struct pci_device_id beiscsi_pci_id_table[] = { @@ -1729,10 +1714,10 @@ index 866d118f7931..d7499e1afaae 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 4eab564ea6a0..f2d360667273 100644 +index cedd558f65eb..d2534cd5559f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7743,6 +7743,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -7811,6 +7811,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -1740,7 +1725,7 @@ index 4eab564ea6a0..f2d360667273 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -7755,13 +7756,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -7823,13 +7824,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, @@ -1954,10 +1939,10 @@ index 5c4c5c0602cb..753b53038690 100644 * * @perf_event_open: diff --git a/include/linux/module.h b/include/linux/module.h -index 8100bb477d86..f758f2869c02 100644 +index 8a298d820dbc..b71215412e59 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -374,6 +374,7 @@ struct module { +@@ -380,6 +380,7 @@ struct module { struct module_attribute *modinfo_attrs; const char *version; const char *srcversion; @@ -2349,7 +2334,7 @@ index 24eda04221e9..128837ea1fb2 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index 55f9f7738ebb..564553afb251 100644 +index bb0d6e6262b1..90ec1ffc75b1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1625,7 +1625,7 @@ config AIO @@ -2428,10 +2413,10 @@ index e343f158e556..840c5ecd4fc6 100644 if (err) return err; diff --git a/kernel/module.c b/kernel/module.c -index 64bd61b2d3ad..c1a2a8a29248 100644 +index ed13917ea5f3..88643913f3e4 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -742,6 +742,7 @@ static struct module_attribute modinfo_##field = { \ +@@ -743,6 +743,7 @@ static struct module_attribute modinfo_##field = { \ MODINFO_ATTR(version); MODINFO_ATTR(srcversion); @@ -2439,7 +2424,7 @@ index 64bd61b2d3ad..c1a2a8a29248 100644 static char last_unloaded_module[MODULE_NAME_LEN+1]; -@@ -1205,6 +1206,7 @@ static struct module_attribute *modinfo_attrs[] = { +@@ -1206,6 +1207,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, &modinfo_srcversion, @@ -2637,7 +2622,7 @@ index 995e15480937..588f7e7885cf 100644 count, align); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 3e623ccc020b..3047abc9a507 100644 +index 270a7df898e2..ac41f848b8a2 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -20,6 +20,7 @@ @@ -2648,7 +2633,7 @@ index 3e623ccc020b..3047abc9a507 100644 /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2339,6 +2340,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2342,6 +2343,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -2661,7 +2646,7 @@ index 3e623ccc020b..3047abc9a507 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2568,6 +2575,7 @@ int main(int argc, char **argv) +@@ -2571,6 +2578,7 @@ int main(int argc, char **argv) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); @@ -2759,19 +2744,6 @@ index 09533cbb7221..d36675494753 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index c9e0de5b00c1..a1b9be78a1e0 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -923,7 +923,7 @@ install-tools: all install-gtk - $(call QUIET_INSTALL, binaries) \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \ - $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \ -- $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(dir_SQ)/trace'; \ -+ $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \ - $(INSTALL) util/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf' - ifndef NO_PERF_READ_VDSO32 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index f405b20c1e6c..a8e298a22709 100644 --- a/tools/testing/selftests/bpf/Makefile diff --git a/sources b/sources index 20aabd587..b01a84b53 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8 -SHA512 (linux-5.13-12377-gf55966571d5e.tar.xz) = e39989d263e5b77eb1086d9366aaa3bcff95dffd783d64ac1fedc5671bef7a7a3f183dbda13c71938280df441197f26de9168a0b8100d4df03307bdc71481302 -SHA512 (kernel-abi-stablelists-5.14.0-0.rc0.20210709gitf55966571d5e.14.tar.bz2) = fb68973d091eee14488efcd10c50721ae05c9d5dcb3b2554c5a4d3ffc0c0eea16e716c787b2dd28b614f1ee5f9f237da0a48c64ab2bd6e9d025b4fee91bbcfad -SHA512 (kernel-kabi-dw-5.14.0-0.rc0.20210709gitf55966571d5e.14.tar.bz2) = 09984360fed897bf17ce3b2ed2e59e153310ac5affd917576607a221ce357ecfa217d418473adcb58254aabbc4873b13071be946eda9f05ffabf6fb7290c56fe +SHA512 (linux-5.14-rc1.tar.xz) = 8a026aaaeb34fbcf8b10ab319f9776dccf86f836a13bbe32da4722daa3e54cb7940eb8c7cd7b8fa686bf5d5e838c2d68c2ea318cb02326ec86b2aec7327e066b +SHA512 (kernel-abi-stablelists-5.14.0-0.rc1.16.tar.bz2) = e4496e9c0079a1a086780b727db6f1394a374103e9531e9c69848ca3e19b636a6ddb6ad56c5bf69fc9e364027428e407c934989fdfad5b9c2278c14e638abec1 +SHA512 (kernel-kabi-dw-5.14.0-0.rc1.16.tar.bz2) = a240d91985943471b3c8981f208adba1381b4738bca6a2af8b5a28785a6dcb19db131c5f48e6c11ba5946f1e2eb1eb74d84dc94328b455717ee17d7a6a16537f -- cgit