From cc9d1aabf0c139c531b0d301bfbfb39d9dd5d7d2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 13 Sep 2021 13:50:49 -0500 Subject: kernel-5.15-0.rc1.12 * Mon Sep 13 2021 Fedora Kernel Team [5.15-0.rc1.12] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 3 +++ kernel-aarch64-debug-rhel.config | 2 ++ kernel-aarch64-fedora.config | 3 +++ kernel-aarch64-rhel.config | 2 ++ kernel-armv7hl-debug-fedora.config | 3 +++ kernel-armv7hl-fedora.config | 3 +++ kernel-armv7hl-lpae-debug-fedora.config | 3 +++ kernel-armv7hl-lpae-fedora.config | 3 +++ kernel-i686-debug-fedora.config | 3 +++ kernel-i686-fedora.config | 3 +++ kernel-ppc64le-debug-fedora.config | 3 +++ kernel-ppc64le-debug-rhel.config | 2 ++ kernel-ppc64le-fedora.config | 3 +++ kernel-ppc64le-rhel.config | 2 ++ kernel-s390x-debug-fedora.config | 3 +++ kernel-s390x-debug-rhel.config | 2 ++ kernel-s390x-fedora.config | 3 +++ kernel-s390x-rhel.config | 2 ++ kernel-s390x-zfcpdump-rhel.config | 2 ++ kernel-x86_64-debug-fedora.config | 3 +++ kernel-x86_64-debug-rhel.config | 2 ++ kernel-x86_64-fedora.config | 3 +++ kernel-x86_64-rhel.config | 2 ++ kernel.spec | 16 ++++++++-------- patch-5.15-redhat.patch | 28 ++++++++++++++-------------- sources | 6 +++--- 27 files changed, 86 insertions(+), 26 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index f74bfc4ea..b04cb77d9 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 = 9 +RHEL_RELEASE = 12 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index aabc9a53b..398f2c79d 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5532,6 +5532,7 @@ CONFIG_QCOM_IRQ_COMBINER=y CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y CONFIG_QCOM_LLCC=m +# CONFIG_QCOM_LMH is not set CONFIG_QCOM_MDT_LOADER=m CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y @@ -7509,6 +7510,7 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=m CONFIG_TEGRA210_EMC=m CONFIG_TEGRA210_EMC_TABLE=y +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_AHB=y CONFIG_TEGRA_BPMP_THERMAL=m @@ -8258,6 +8260,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 3a91b0c67..d987a2aba 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4442,6 +4442,7 @@ CONFIG_QCOM_HIDMA_MGMT=m CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y # CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6672,6 +6673,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e896b102e..58b78c2ce 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5509,6 +5509,7 @@ CONFIG_QCOM_IRQ_COMBINER=y CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y CONFIG_QCOM_LLCC=m +# CONFIG_QCOM_LMH is not set CONFIG_QCOM_MDT_LOADER=m CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y @@ -7484,6 +7485,7 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=m CONFIG_TEGRA210_EMC=m CONFIG_TEGRA210_EMC_TABLE=y +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_AHB=y CONFIG_TEGRA_BPMP_THERMAL=m @@ -8233,6 +8235,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 0b2a50066..c4f8d2347 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4421,6 +4421,7 @@ CONFIG_QCOM_HIDMA_MGMT=m CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y # CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6649,6 +6650,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index d42d9cc2c..c314170f0 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5634,6 +5634,7 @@ CONFIG_QCOM_HFPLL=m CONFIG_QCOM_IOMMU=y # CONFIG_QCOM_IPCC is not set # CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_LMH is not set CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m @@ -7712,6 +7713,7 @@ CONFIG_TEGRA124_EMC=m CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_EMC=m CONFIG_TEGRA30_EMC=m +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m @@ -8500,6 +8502,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VDSO is not set CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 0ecc39d04..50563b165 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5612,6 +5612,7 @@ CONFIG_QCOM_HFPLL=m CONFIG_QCOM_IOMMU=y # CONFIG_QCOM_IPCC is not set # CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_LMH is not set CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m @@ -7688,6 +7689,7 @@ CONFIG_TEGRA124_EMC=m CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_EMC=m CONFIG_TEGRA30_EMC=m +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m @@ -8476,6 +8478,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VDSO is not set CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index b88b2ab60..691b7321f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5489,6 +5489,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set # CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_LMH is not set CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m @@ -7471,6 +7472,7 @@ CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA30_EMC=m +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m @@ -8246,6 +8248,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ce7b0a626..63a4ecc0d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5467,6 +5467,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set # CONFIG_QCOM_LLCC is not set +# CONFIG_QCOM_LMH is not set CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m @@ -7447,6 +7448,7 @@ CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA30_EMC=m +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m @@ -8222,6 +8224,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 7ba558852..eea2e0cb5 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5005,6 +5005,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6777,6 +6778,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7443,6 +7445,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index ace8a393e..6c062c60e 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -4983,6 +4983,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6753,6 +6754,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7419,6 +7421,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 698cd766f..ef0f23f47 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4693,6 +4693,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6437,6 +6438,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7092,6 +7094,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 9d00a3967..d7273f78e 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4234,6 +4234,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6430,6 +6431,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 2cc2f7207..204928644 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4670,6 +4670,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6412,6 +6413,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7067,6 +7069,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index fc9b1ba1d..5b3e10fc2 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4217,6 +4217,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6411,6 +6412,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 99b2b9d6c..2ed5ca1f0 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4627,6 +4627,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6382,6 +6383,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7047,6 +7049,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 65d17fe69..bb59d2f4b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4169,6 +4169,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6384,6 +6385,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 34cce5376..32eb30e89 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4604,6 +4604,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6357,6 +6358,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7022,6 +7024,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 4080b3ead..8292e93fa 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4152,6 +4152,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6365,6 +6366,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 217d9fe52..bbae9354d 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4175,6 +4175,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6399,6 +6400,7 @@ CONFIG_UWB_I1480U=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index e4dc4e4de..65b32fd24 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5047,6 +5047,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6830,6 +6831,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7499,6 +7501,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index e903d143c..eeac71868 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4421,6 +4421,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6637,6 +6638,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 9e9683899..ff3b02bf4 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5025,6 +5025,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCOM_SCM is not set @@ -6806,6 +6807,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA30_TSENSOR is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7475,6 +7477,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index cd3dc2284..505d323b2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4401,6 +4401,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_IOMMU is not set # CONFIG_QCOM_IPCC is not set +# CONFIG_QCOM_LMH is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -6615,6 +6616,7 @@ CONFIG_VDPA=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m +# CONFIG_VDPA_USER is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel.spec b/kernel.spec index ddbb7efd0..f8b07c4df 100755 --- a/kernel.spec +++ b/kernel.spec @@ -78,9 +78,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.20210910gitbf9f243f23e6.9 +%global distro_build 0.rc1.12 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -125,13 +125,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc0.20210910gitbf9f243f23e6.9 +%define pkgrelease 0.rc1.12 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210910gitbf9f243f23e6.9%{?buildid}%{?dist} +%define specrelease 0.rc1.12%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-10807-gbf9f243f23e6.tar.xz +Source0: linux-5.15-rc1.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-10807-gbf9f243f23e6 -c -mv linux-5.14-10807-gbf9f243f23e6 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc1 -c +mv linux-5.15-rc1 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,7 +2958,7 @@ fi # # %changelog -* Fri Sep 10 2021 Fedora Kernel Team [5.15-0.rc0.20210910gitbf9f243f23e6.9] +* Mon Sep 13 2021 Fedora Kernel Team [5.15-0.rc1.12] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) * Fri Sep 10 2021 Fedora Kernel Team [5.15-0.rc0.20210910gitbf9f243f23e6.8] diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 02b5f6d33..546707328 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -141,7 +141,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 2d1e491f7737..b056845109e5 100644 +index 7cfe4ff36f44..eab999eeb925 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -581,10 +581,10 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index b24513ec3fae..8308569f66e0 100644 +index 5b54c80b9d32..86c314f8d8a0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1721,6 +1721,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1720,6 +1720,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; @@ -1573,10 +1573,10 @@ index 75dbe77b0b4b..029ff8576f8e 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 8679a108f571..0875e3578088 100644 +index 7efb31b87f37..c9eeeb9eca52 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) +@@ -263,6 +263,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1586,7 +1586,7 @@ index 8679a108f571..0875e3578088 100644 switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -320,6 +323,7 @@ enum nvme_disposition { +@@ -322,6 +325,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1594,7 +1594,7 @@ index 8679a108f571..0875e3578088 100644 }; static inline enum nvme_disposition nvme_decide_disposition(struct request *req) -@@ -327,15 +331,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -329,15 +333,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if (likely(nvme_req(req)->status == 0)) return COMPLETE; @@ -1614,7 +1614,7 @@ index 8679a108f571..0875e3578088 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -357,6 +362,14 @@ static inline void nvme_end_req(struct request *req) +@@ -359,6 +364,14 @@ static inline void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1629,7 +1629,7 @@ index 8679a108f571..0875e3578088 100644 void nvme_complete_rq(struct request *req) { trace_nvme_complete_rq(req); -@@ -375,6 +388,9 @@ void nvme_complete_rq(struct request *req) +@@ -377,6 +390,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -1640,7 +1640,7 @@ index 8679a108f571..0875e3578088 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 37ce3e8b1db2..00a3e40026cf 100644 +index 5d7bc58a27bd..2f484c95a72e 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1676,7 +1676,7 @@ index 37ce3e8b1db2..00a3e40026cf 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) -@@ -796,8 +802,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -813,8 +819,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1687,10 +1687,10 @@ index 37ce3e8b1db2..00a3e40026cf 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index a2e1f298b217..87fb7efca59b 100644 +index 9871c0c9374c..08afeca5ffda 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -739,6 +739,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -740,6 +740,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags); void nvme_failover_req(struct request *req); @@ -1698,7 +1698,7 @@ index a2e1f298b217..87fb7efca59b 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -776,6 +777,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -778,6 +779,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, static inline void nvme_failover_req(struct request *req) { } diff --git a/sources b/sources index 9edea4ffc..cda5112d5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14-10807-gbf9f243f23e6.tar.xz) = 035ea867189f52339b3ec83d8b3296670c7d9cf56521ef25c79a8366d6c03793f2ef9d619eba9260f01088a26c576d9b4354a56c3e458f1fa0faba948e7e2223 -SHA512 (kernel-abi-stablelists-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.tar.bz2) = 28d6abc1362262a32557de9d3c6c298f2a751cd7b0ff6b357e6697dfe9e50c31bcbbce9c65b69f2eef75a54b6573aacc726e249f7b58e960e2f7e28b87bdf589 -SHA512 (kernel-kabi-dw-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.tar.bz2) = ba4ace2990a14f90a15d24b1972e82549de062ffba2db29d1412c50d1eb9c9dcd1845aebb0b5dfd4eda4e9b7763bfa030fb7f18fa52ea35856f438a1c84605f9 +SHA512 (linux-5.15-rc1.tar.xz) = 4098b06456fcd150d6d3c8879908a43f8befd8b8a692f8e67ca5256e03705e5e6b56933d1f3f741fcf33a469263a884bab87002e18d19b251a91abfd0e5f3e73 +SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.12.tar.bz2) = 712f5edae2295c38f2177cdc77bad896d3bb137aa3f496b9ebc398fe69b3bcd775a7d054dce7600f6556a155b521e4efaad0af868ee14ebb6a3de92a16cc8947 +SHA512 (kernel-kabi-dw-5.15.0-0.rc1.12.tar.bz2) = 3d1b0fb2cdf3f5dc242d2d0e03a1b448594007d98273696127b7be41dbf41144729dcaa42dce6bd5bed3ff26c3bb79fe497aabe9173905317182b1cf697b6644 -- cgit