From 38b1d5dfb4374f95851c55fca882e46e7a28e451 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 9 Oct 2023 07:58:38 -0500 Subject: [PATCH] kernel-6.6.0-0.rc5.40 * Mon Oct 09 2023 Fedora Kernel Team [6.6.0-0.rc5.40] - CI: Remove unused kpet_tree_family (Nikolai Kondrashov) - Linux v6.6.0-0.rc5 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 14 +-- kernel-aarch64-16k-fedora.config | 14 +-- kernel-aarch64-64k-debug-rhel.config | 2 + kernel-aarch64-64k-rhel.config | 2 + kernel-aarch64-debug-fedora.config | 14 +-- kernel-aarch64-debug-rhel.config | 2 + kernel-aarch64-fedora.config | 14 +-- kernel-aarch64-rhel.config | 2 + kernel-aarch64-rt-debug-rhel.config | 2 + kernel-aarch64-rt-rhel.config | 2 + kernel-ppc64le-debug-fedora.config | 2 + kernel-ppc64le-debug-rhel.config | 2 + kernel-ppc64le-fedora.config | 2 + kernel-ppc64le-rhel.config | 2 + kernel-s390x-debug-fedora.config | 2 + kernel-s390x-debug-rhel.config | 2 + kernel-s390x-fedora.config | 2 + kernel-s390x-rhel.config | 2 + kernel-s390x-zfcpdump-rhel.config | 2 + kernel-x86_64-debug-fedora.config | 4 +- kernel-x86_64-debug-rhel.config | 2 + kernel-x86_64-fedora.config | 4 +- kernel-x86_64-rhel.config | 2 + kernel-x86_64-rt-debug-rhel.config | 2 + kernel-x86_64-rt-rhel.config | 2 + kernel.spec | 103 ++++++++++++++------ partial-clang-debug-snip.config | 3 + partial-clang-snip.config | 3 + partial-clang_lto-aarch64-debug-snip.config | 3 + partial-clang_lto-aarch64-snip.config | 5 + partial-clang_lto-x86_64-debug-snip.config | 3 + partial-clang_lto-x86_64-snip.config | 5 + partial-kgcov-debug-snip.config | 4 + patch-6.6-redhat.patch | 8 +- sources | 6 +- 36 files changed, 185 insertions(+), 62 deletions(-) create mode 100644 partial-clang-debug-snip.config create mode 100644 partial-clang-snip.config create mode 100644 partial-clang_lto-aarch64-debug-snip.config create mode 100644 partial-clang_lto-aarch64-snip.config create mode 100644 partial-clang_lto-x86_64-debug-snip.config create mode 100644 partial-clang_lto-x86_64-snip.config create mode 100644 partial-kgcov-debug-snip.config diff --git a/Makefile.rhelver b/Makefile.rhelver index cb5bf1f10..3c64ec952 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 = 36 +RHEL_RELEASE = 40 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 92fbc4495..96744b23c 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -394,6 +394,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -3413,7 +3414,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_QCM2290=m # CONFIG_INTERCONNECT_QCOM_QCS404 is not set # CONFIG_INTERCONNECT_QCOM_QDU1000 is not set -# CONFIG_INTERCONNECT_QCOM_SA8775P is not set +CONFIG_INTERCONNECT_QCOM_SA8775P=m CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_INTERCONNECT_QCOM_SC7280=m CONFIG_INTERCONNECT_QCOM_SC8180X=m @@ -3556,6 +3557,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y @@ -5403,7 +5405,7 @@ CONFIG_NVMEM_MESON_EFUSE=m CONFIG_NVMEM_MESON_MX_EFUSE=m CONFIG_NVMEM_QCOM_QFPROM=m # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set -# CONFIG_NVMEM_REBOOT_MODE is not set +CONFIG_NVMEM_REBOOT_MODE=m CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m @@ -5725,7 +5727,7 @@ CONFIG_PHY_QCOM_QMP_UFS=m # CONFIG_PHY_QCOM_QMP_USB_LEGACY is not set CONFIG_PHY_QCOM_QMP_USB=m CONFIG_PHY_QCOM_QUSB2=m -# CONFIG_PHY_QCOM_SGMII_ETH is not set +CONFIG_PHY_QCOM_SGMII_ETH=m CONFIG_PHY_QCOM_SNPS_EUSB2=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_HSIC=m @@ -5834,7 +5836,7 @@ CONFIG_PINCTRL_QDF2XXX=m # CONFIG_PINCTRL_QDU1000 is not set CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_ROCKCHIP=y -# CONFIG_PINCTRL_SA8775P is not set +CONFIG_PINCTRL_SA8775P=m CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SC7280_LPASS_LPI=m CONFIG_PINCTRL_SC7280=m @@ -6699,8 +6701,8 @@ CONFIG_S2IO=m CONFIG_S390_HYPFS=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set -# CONFIG_SA_GCC_8775P is not set -# CONFIG_SA_GPUCC_8775P is not set +CONFIG_SA_GCC_8775P=m +CONFIG_SA_GPUCC_8775P=m # CONFIG_SAMPLE_FPROBE is not set # CONFIG_SAMPLES is not set CONFIG_SATA_ACARD_AHCI=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 8563ee5cb..f3ab44bae 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -394,6 +394,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -3396,7 +3397,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_QCM2290=m # CONFIG_INTERCONNECT_QCOM_QCS404 is not set # CONFIG_INTERCONNECT_QCOM_QDU1000 is not set -# CONFIG_INTERCONNECT_QCOM_SA8775P is not set +CONFIG_INTERCONNECT_QCOM_SA8775P=m CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_INTERCONNECT_QCOM_SC7280=m CONFIG_INTERCONNECT_QCOM_SC8180X=m @@ -3539,6 +3540,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y @@ -5377,7 +5379,7 @@ CONFIG_NVMEM_MESON_EFUSE=m CONFIG_NVMEM_MESON_MX_EFUSE=m CONFIG_NVMEM_QCOM_QFPROM=m # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set -# CONFIG_NVMEM_REBOOT_MODE is not set +CONFIG_NVMEM_REBOOT_MODE=m CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m @@ -5698,7 +5700,7 @@ CONFIG_PHY_QCOM_QMP_UFS=m # CONFIG_PHY_QCOM_QMP_USB_LEGACY is not set CONFIG_PHY_QCOM_QMP_USB=m CONFIG_PHY_QCOM_QUSB2=m -# CONFIG_PHY_QCOM_SGMII_ETH is not set +CONFIG_PHY_QCOM_SGMII_ETH=m CONFIG_PHY_QCOM_SNPS_EUSB2=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_HSIC=m @@ -5807,7 +5809,7 @@ CONFIG_PINCTRL_QDF2XXX=m # CONFIG_PINCTRL_QDU1000 is not set CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_ROCKCHIP=y -# CONFIG_PINCTRL_SA8775P is not set +CONFIG_PINCTRL_SA8775P=m CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SC7280_LPASS_LPI=m CONFIG_PINCTRL_SC7280=m @@ -6672,8 +6674,8 @@ CONFIG_S2IO=m CONFIG_S390_HYPFS=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set -# CONFIG_SA_GCC_8775P is not set -# CONFIG_SA_GPUCC_8775P is not set +CONFIG_SA_GCC_8775P=m +CONFIG_SA_GPUCC_8775P=m # CONFIG_SAMPLE_FPROBE is not set # CONFIG_SAMPLES is not set CONFIG_SATA_ACARD_AHCI=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 949846dde..0001be49b 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -324,6 +324,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -2903,6 +2904,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index beabeee47..5f36b0107 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -324,6 +324,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -2887,6 +2888,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 2a76e3466..9fc5dd864 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -394,6 +394,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -3413,7 +3414,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_QCM2290=m # CONFIG_INTERCONNECT_QCOM_QCS404 is not set # CONFIG_INTERCONNECT_QCOM_QDU1000 is not set -# CONFIG_INTERCONNECT_QCOM_SA8775P is not set +CONFIG_INTERCONNECT_QCOM_SA8775P=m CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_INTERCONNECT_QCOM_SC7280=m CONFIG_INTERCONNECT_QCOM_SC8180X=m @@ -3556,6 +3557,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y @@ -5403,7 +5405,7 @@ CONFIG_NVMEM_MESON_EFUSE=m CONFIG_NVMEM_MESON_MX_EFUSE=m CONFIG_NVMEM_QCOM_QFPROM=m # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set -# CONFIG_NVMEM_REBOOT_MODE is not set +CONFIG_NVMEM_REBOOT_MODE=m CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m @@ -5725,7 +5727,7 @@ CONFIG_PHY_QCOM_QMP_UFS=m # CONFIG_PHY_QCOM_QMP_USB_LEGACY is not set CONFIG_PHY_QCOM_QMP_USB=m CONFIG_PHY_QCOM_QUSB2=m -# CONFIG_PHY_QCOM_SGMII_ETH is not set +CONFIG_PHY_QCOM_SGMII_ETH=m CONFIG_PHY_QCOM_SNPS_EUSB2=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_HSIC=m @@ -5834,7 +5836,7 @@ CONFIG_PINCTRL_QDF2XXX=m # CONFIG_PINCTRL_QDU1000 is not set CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_ROCKCHIP=y -# CONFIG_PINCTRL_SA8775P is not set +CONFIG_PINCTRL_SA8775P=m CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SC7280_LPASS_LPI=m CONFIG_PINCTRL_SC7280=m @@ -6699,8 +6701,8 @@ CONFIG_S2IO=m CONFIG_S390_HYPFS=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set -# CONFIG_SA_GCC_8775P is not set -# CONFIG_SA_GPUCC_8775P is not set +CONFIG_SA_GCC_8775P=m +CONFIG_SA_GPUCC_8775P=m # CONFIG_SAMPLE_FPROBE is not set # CONFIG_SAMPLES is not set CONFIG_SATA_ACARD_AHCI=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c3b504eb0..4dcfd0fee 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -324,6 +324,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -2899,6 +2900,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index a3716c381..de3a43923 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -394,6 +394,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -3396,7 +3397,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_QCM2290=m # CONFIG_INTERCONNECT_QCOM_QCS404 is not set # CONFIG_INTERCONNECT_QCOM_QDU1000 is not set -# CONFIG_INTERCONNECT_QCOM_SA8775P is not set +CONFIG_INTERCONNECT_QCOM_SA8775P=m CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_INTERCONNECT_QCOM_SC7280=m CONFIG_INTERCONNECT_QCOM_SC8180X=m @@ -3539,6 +3540,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y @@ -5377,7 +5379,7 @@ CONFIG_NVMEM_MESON_EFUSE=m CONFIG_NVMEM_MESON_MX_EFUSE=m CONFIG_NVMEM_QCOM_QFPROM=m # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set -# CONFIG_NVMEM_REBOOT_MODE is not set +CONFIG_NVMEM_REBOOT_MODE=m CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m @@ -5698,7 +5700,7 @@ CONFIG_PHY_QCOM_QMP_UFS=m # CONFIG_PHY_QCOM_QMP_USB_LEGACY is not set CONFIG_PHY_QCOM_QMP_USB=m CONFIG_PHY_QCOM_QUSB2=m -# CONFIG_PHY_QCOM_SGMII_ETH is not set +CONFIG_PHY_QCOM_SGMII_ETH=m CONFIG_PHY_QCOM_SNPS_EUSB2=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_HSIC=m @@ -5807,7 +5809,7 @@ CONFIG_PINCTRL_QDF2XXX=m # CONFIG_PINCTRL_QDU1000 is not set CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_ROCKCHIP=y -# CONFIG_PINCTRL_SA8775P is not set +CONFIG_PINCTRL_SA8775P=m CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SC7280_LPASS_LPI=m CONFIG_PINCTRL_SC7280=m @@ -6672,8 +6674,8 @@ CONFIG_S2IO=m CONFIG_S390_HYPFS=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set -# CONFIG_SA_GCC_8775P is not set -# CONFIG_SA_GPUCC_8775P is not set +CONFIG_SA_GCC_8775P=m +CONFIG_SA_GPUCC_8775P=m # CONFIG_SAMPLE_FPROBE is not set # CONFIG_SAMPLES is not set CONFIG_SATA_ACARD_AHCI=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 87fd8281f..921ca1ca3 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -324,6 +324,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -2883,6 +2884,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 33ecbaf73..715cf457c 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -324,6 +324,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -2939,6 +2940,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index b2531d988..bf3a30f3c 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -324,6 +324,7 @@ CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -2923,6 +2924,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b1df41778..81e934e17 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m @@ -2878,6 +2879,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a7ebdd2a9..9d4a86efb 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -261,6 +261,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2608,6 +2609,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index a478aeb54..df7b23b88 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m @@ -2858,6 +2859,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1eb835896..3b745e0b4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -261,6 +261,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2592,6 +2593,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2feec50c3..1228f43c6 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -287,6 +287,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m @@ -2850,6 +2851,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index d926e3670..6375eb0f9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -260,6 +260,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2593,6 +2594,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 398bbdd7b..0e1614496 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -287,6 +287,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m @@ -2830,6 +2831,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5409c9587..ac9c2ebd8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -260,6 +260,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2577,6 +2578,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d0e30587d..d757bc68c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -260,6 +260,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2585,6 +2586,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index cf377006f..1f98b1b0c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -154,7 +154,7 @@ CONFIG_AD7949=m # CONFIG_AD9834 is not set # CONFIG_ADA4250 is not set CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADDRESS_MASKING is not set +CONFIG_ADDRESS_MASKING=y # CONFIG_ADE7854 is not set # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set @@ -326,6 +326,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m @@ -3166,6 +3167,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 455acbe80..8e43d3fc0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2784,6 +2785,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 99ab22e88..961058f48 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -154,7 +154,7 @@ CONFIG_AD7949=m # CONFIG_AD9834 is not set # CONFIG_ADA4250 is not set CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADDRESS_MASKING is not set +CONFIG_ADDRESS_MASKING=y # CONFIG_ADE7854 is not set # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set @@ -326,6 +326,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m @@ -3146,6 +3147,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m CONFIG_IPV6_ILA=m CONFIG_IPV6_IOAM6_LWTUNNEL=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index a4f7aeb20..99147e0d8 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2768,6 +2769,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 86748c6e2..7c1f6f3d3 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2824,6 +2825,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 67974209b..3fe3e063a 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -284,6 +284,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2808,6 +2809,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 +# CONFIG_IPU_BRIDGE is not set CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set diff --git a/kernel.spec b/kernel.spec index f66edc43a..bd30b0f64 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.6.0 %define specversion 6.6.0 %define patchversion 6.6 -%define pkgrelease 0.rc4.20231005git3006adf3be79.36 +%define pkgrelease 0.rc5.40 %define kversion 6 -%define tarfile_release 6.6-rc4-37-g3006adf3be79 +%define tarfile_release 6.6-rc5 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20231005git3006adf3be79.36%{?buildid}%{?dist} +%define specrelease 0.rc5.40%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.6.0 @@ -470,6 +470,8 @@ Summary: The Linux kernel %endif %endif +%define all_configs %{name}-%{specrpmversion}-*.config + # don't build noarch kernels or headers (duh) %ifarch noarch %define with_up 0 @@ -481,7 +483,6 @@ Summary: The Linux kernel %define with_bpftool 0 %define with_selftests 0 %define with_debug 0 -%define all_arch_configs %{name}-%{specrpmversion}-*.config %endif # sparse blows up on ppc @@ -510,13 +511,11 @@ Summary: The Linux kernel %ifarch i686 %define asmarch x86 %define hdrarch i386 -%define all_arch_configs %{name}-%{specrpmversion}-i?86*.config %define kernel_image arch/x86/boot/bzImage %endif %ifarch x86_64 %define asmarch x86 -%define all_arch_configs %{name}-%{specrpmversion}-x86_64*.config %define kernel_image arch/x86/boot/bzImage %endif @@ -527,19 +526,16 @@ Summary: The Linux kernel %define kernel_image vmlinux %define kernel_image_elf 1 %define use_vdso 0 -%define all_arch_configs %{name}-%{specrpmversion}-ppc64le*.config %endif %ifarch s390x %define asmarch s390 %define hdrarch s390 -%define all_arch_configs %{name}-%{specrpmversion}-s390x.config %define kernel_image arch/s390/boot/bzImage %define vmlinux_decompressor arch/s390/boot/vmlinux %endif %ifarch aarch64 -%define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config %define asmarch arm64 %define hdrarch arm64 %define make_target vmlinuz.efi @@ -912,7 +908,14 @@ Source65: filter-s390x.sh.fedora Source66: filter-modules.sh.fedora %endif -Source75: partial-kgcov-snip.config +Source70: partial-kgcov-snip.config +Source71: partial-kgcov-debug-snip.config +Source72: partial-clang-snip.config +Source73: partial-clang-debug-snip.config +Source74: partial-clang_lto-x86_64-snip.config +Source75: partial-clang_lto-x86_64-debug-snip.config +Source76: partial-clang_lto-aarch64-snip.config +Source77: partial-clang_lto-aarch64-debug-snip.config Source80: generate_all_configs.sh Source81: process_configs.sh @@ -1768,30 +1771,56 @@ cp $RPM_SOURCE_DIR/%{name}-*.config . cp %{SOURCE80} . # merge.py cp %{SOURCE3000} . -# kernel-local -cp %{SOURCE3001} . +# kernel-local - rename and copy for partial snippet config process +cp %{SOURCE3001} partial-kernel-local-snip.config +cp %{SOURCE3001} partial-kernel-local-debug-snip.config FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion} SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled} +# Collect custom defined config options +PARTIAL_CONFIGS="" +%if %{with_gcov} +PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE70} %{SOURCE71}" +%endif +%if %{with toolchain_clang} +PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE72} %{SOURCE73}" +%endif +%if %{with clang_lto} +PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE74} %{SOURCE75} %{SOURCE76} %{SOURCE77}" +%endif +PARTIAL_CONFIGS="$PARTIAL_CONFIGS partial-kernel-local-snip.config partial-kernel-local-debug-snip.config" + +GetArch() +{ + case "$1" in + *aarch64*) echo "aarch64" ;; + *ppc64le*) echo "ppc64le" ;; + *s390x*) echo "s390x" ;; + *x86_64*) echo "x86_64" ;; + # no arch, apply everywhere + *) echo "" ;; + esac +} + # Merge in any user-provided local config option changes %ifnarch %nobuildarches -for i in %{all_arch_configs} +for i in %{all_configs} do - mv $i $i.tmp - ./merge.py %{SOURCE3001} $i.tmp > $i -%if %{with_gcov} - echo "Merging with gcov options" - cat %{SOURCE75} - mv $i $i.tmp - ./merge.py %{SOURCE75} $i.tmp > $i -%endif - rm $i.tmp -done -%endif + kern_arch="$(GetArch $i)" + kern_debug="$(echo $i | grep -q debug && echo "debug" || echo "")" -%if %{with clang_lto} -for i in *aarch64*.config *x86_64*.config; do - sed -i 's/# CONFIG_LTO_CLANG_THIN is not set/CONFIG_LTO_CLANG_THIN=y/' $i - sed -i 's/CONFIG_LTO_NONE=y/# CONFIG_LTO_NONE is not set/' $i + for j in $PARTIAL_CONFIGS + do + part_arch="$(GetArch $j)" + part_debug="$(echo $j | grep -q debug && echo "debug" || echo "")" + + # empty arch means apply to all arches + if [ "$part_arch" == "" -o "$part_arch" == "$kern_arch" ] && [ "$part_debug" == "$kern_debug" ] + then + mv $i $i.tmp + ./merge.py $j $i.tmp > $i + fi + done + rm -f $i.tmp done %endif @@ -3697,6 +3726,24 @@ fi\ # # %changelog +* Mon Oct 09 2023 Fedora Kernel Team [6.6.0-0.rc5.40] +- CI: Remove unused kpet_tree_family (Nikolai Kondrashov) +- Linux v6.6.0-0.rc5 + +* Sun Oct 08 2023 Fedora Kernel Team [6.6.0-0.rc4.b9ddbb0cde2a.39] +- Linux v6.6.0-0.rc4.b9ddbb0cde2a + +* Sat Oct 07 2023 Fedora Kernel Team [6.6.0-0.rc4.82714078aee4.38] +- Linux v6.6.0-0.rc4.82714078aee4 + +* Fri Oct 06 2023 Fedora Kernel Team [6.6.0-0.rc4.b78b18fb8ee1.37] +- Add clang config framework (Don Zickus) +- Apply partial snippet configs to all configs (Don Zickus) +- Remove unpackaged kgcov config files (Don Zickus) +- redhat/configs: enable missing Kconfig options for Qualcomm RideSX4 (Brian Masney) +- enable CONFIG_ADDRESS_MASKING for x86_64 (Chris von Recklinghausen) +- Linux v6.6.0-0.rc4.b78b18fb8ee1 + * Thu Oct 05 2023 Fedora Kernel Team [6.6.0-0.rc4.3006adf3be79.36] - Linux v6.6.0-0.rc4.3006adf3be79 diff --git a/partial-clang-debug-snip.config b/partial-clang-debug-snip.config new file mode 100644 index 000000000..19fa1520e --- /dev/null +++ b/partial-clang-debug-snip.config @@ -0,0 +1,3 @@ +# clang +CONFIG_KASAN_STACK=y +# CONFIG_KMSAN is not set diff --git a/partial-clang-snip.config b/partial-clang-snip.config new file mode 100644 index 000000000..841c19dcb --- /dev/null +++ b/partial-clang-snip.config @@ -0,0 +1,3 @@ +# clang +# CONFIG_KASAN_STACK is not set +# CONFIG_KMSAN is not set diff --git a/partial-clang_lto-aarch64-debug-snip.config b/partial-clang_lto-aarch64-debug-snip.config new file mode 100644 index 000000000..0178f37de --- /dev/null +++ b/partial-clang_lto-aarch64-debug-snip.config @@ -0,0 +1,3 @@ +# clang_lto +CONFIG_KASAN_STACK=y +# CONFIG_KMSAN is not set diff --git a/partial-clang_lto-aarch64-snip.config b/partial-clang_lto-aarch64-snip.config new file mode 100644 index 000000000..9e30765c4 --- /dev/null +++ b/partial-clang_lto-aarch64-snip.config @@ -0,0 +1,5 @@ +# clang_lto +# CONFIG_KASAN_STACK is not set +# CONFIG_KMSAN is not set +CONFIG_LTO_CLANG_THIN=y +# CONFIG_LTO_NONE is not set diff --git a/partial-clang_lto-x86_64-debug-snip.config b/partial-clang_lto-x86_64-debug-snip.config new file mode 100644 index 000000000..0178f37de --- /dev/null +++ b/partial-clang_lto-x86_64-debug-snip.config @@ -0,0 +1,3 @@ +# clang_lto +CONFIG_KASAN_STACK=y +# CONFIG_KMSAN is not set diff --git a/partial-clang_lto-x86_64-snip.config b/partial-clang_lto-x86_64-snip.config new file mode 100644 index 000000000..9e30765c4 --- /dev/null +++ b/partial-clang_lto-x86_64-snip.config @@ -0,0 +1,5 @@ +# clang_lto +# CONFIG_KASAN_STACK is not set +# CONFIG_KMSAN is not set +CONFIG_LTO_CLANG_THIN=y +# CONFIG_LTO_NONE is not set diff --git a/partial-kgcov-debug-snip.config b/partial-kgcov-debug-snip.config new file mode 100644 index 000000000..fb373597e --- /dev/null +++ b/partial-kgcov-debug-snip.config @@ -0,0 +1,4 @@ +# kgcov +CONFIG_GCOV_KERNEL=y +CONFIG_GCOV_PROFILE_ALL=y +# CONFIG_GCOV_PROFILE_FTRACE is not set diff --git a/patch-6.6-redhat.patch b/patch-6.6-redhat.patch index 2ff318907..632856429 100644 --- a/patch-6.6-redhat.patch +++ b/patch-6.6-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 373649c7374e..6c81485add7c 100644 +index 88ebf6547964..347ae064ce5a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -174,10 +174,10 @@ index 9557808e8937..fafcbf82c9f2 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index b10515c0200b..6e1ed0068863 100644 +index 78f20e632712..70e11a7f350f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1295,7 +1295,7 @@ endchoice +@@ -1308,7 +1308,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -1331,7 +1331,7 @@ index f35647c470af..e57357f23306 100644 { } diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index a79c110c7e51..cef4feacb300 100644 +index 51ec9e7e784f..8c3713edc7a6 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ diff --git a/sources b/sources index 57cd39576..74bf93b89 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.6-rc4-37-g3006adf3be79.tar.xz) = 83e4ce7c823d5a6606e4996e37c23f0ca60c11c460239b29a0489f25e8ceb6073bb391732f3d786dd6ffef794d2fd0295038a04410b184faa497cf0c15f91914 -SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 977c58481fcc9e0064e0682009eddefaf84c17b9481cba201a77d02dbdfccf2c523a46df89f452380bfdcc2c6c0dbec073714642316774213b4392f1b165d826 -SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 9d3a42a5c3c9397469148b45d6fdb90766a263697bf95c3bc9f5da1c7fbcedd124b3a279f02c81f97a8b06a2bc41671d93bab4239f3fd1a8c6a149553b2d12a9 +SHA512 (linux-6.6-rc5.tar.xz) = cd93fb0bfc8952e89a3a5ade0654a50a662a532abad7da8d10dfda75c01763144c14bc77985da918e6acd3ef98d5c63709937e20e47fa8b8dd6d2ac1bf2b3e2f +SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = d43257157cf21867f4b9560ddf5b626da50bb967a9509745a1c29e56c925c55d227ab7f2a9d0a5ea30109bddeb61d8893f68d3b7a0c30d33ac8a390903f811c7 +SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 242a4b041bd693e53411560b63cdcc35b2218d3cc5d77802e9e9f4e94fe233b66229e1b1967c1adb2096567f643bb225039a23dff3f4351d7718c993c6011e16