From 9aa8da0d56c3a4a9c6ca745192dfed3122366520 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 10 Jul 2023 09:56:17 -0500 Subject: [PATCH] kernel-6.5.0-0.rc1.11 * Thu Jul 06 2023 Fedora Kernel Team [6.5.0-0.rc0.c17414a273b8.11] - fedira: enable pending-fedora CONFIG_CPUFREQ_DT_PLATDEV as a module (Patrick Talbert) - Linux v6.5.0-0.rc0.c17414a273b8 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-64k-debug-rhel.config | 1 + kernel-aarch64-64k-rhel.config | 1 + kernel-aarch64-debug-fedora.config | 3 ++- kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 3 ++- kernel-aarch64-rhel.config | 1 + kernel-aarch64-rt-debug-rhel.config | 1 + kernel-aarch64-rt-rhel.config | 1 + 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-ppc64le-debug-fedora.config | 4 +++- kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 4 +++- kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 4 +++- kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 4 +++- kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 4 +++- kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 4 +++- kernel-x86_64-rhel.config | 1 + kernel-x86_64-rt-debug-rhel.config | 1 + kernel-x86_64-rt-rhel.config | 1 + kernel.spec | 26 ++++++++++++++++++------- patch-6.5-redhat.patch | 10 +++++----- sources | 6 +++--- 31 files changed, 77 insertions(+), 28 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 3606a7785..7f148a411 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 = 12 +RHEL_RELEASE = 11 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 5d7696100..9d43063ff 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -7601,6 +7601,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index b265387b1..95f9c8807 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -7576,6 +7576,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 078bdd9fd..753c66b35 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5966,7 +5966,7 @@ CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m # CONFIG_QCOM_EBI2 is not set -CONFIG_QCOM_EMAC=m +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y @@ -9451,6 +9451,7 @@ CONFIG_XILINX_PR_DECOUPLER=m CONFIG_XILINX_SDFEC=m CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set CONFIG_XILINX_XADC=m CONFIG_XILINX_XDMA=m CONFIG_XILINX_ZYNQMP_DMA=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index adde1cde8..cb9881069 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -7597,6 +7597,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6cb3875f0..7458cba00 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5939,7 +5939,7 @@ CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m # CONFIG_QCOM_EBI2 is not set -CONFIG_QCOM_EMAC=m +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y @@ -9422,6 +9422,7 @@ CONFIG_XILINX_PR_DECOUPLER=m CONFIG_XILINX_SDFEC=m CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set CONFIG_XILINX_XADC=m CONFIG_XILINX_XDMA=m CONFIG_XILINX_ZYNQMP_DMA=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8404c04be..2d438e568 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -7572,6 +7572,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index f8c68b354..ee72b856a 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -7810,6 +7810,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index be47c3670..9ceaa1f90 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -7785,6 +7785,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 7f0a3cd39..e4d974566 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -4977,7 +4977,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -5929,6 +5929,7 @@ CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y # CONFIG_QCOM_CPR is not set # CONFIG_QCOM_EBI2 is not set +# CONFIG_QCOM_EMAC is not set CONFIG_QCOM_FASTRPC=m # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set @@ -9497,6 +9498,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m CONFIG_XILINX_WATCHDOG=m +# CONFIG_XILINX_WINDOW_WATCHDOG is not set CONFIG_XILINX_XADC=m CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5d5f54edb..8685a2df3 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4953,7 +4953,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -5904,6 +5904,7 @@ CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y # CONFIG_QCOM_CPR is not set # CONFIG_QCOM_EBI2 is not set +# CONFIG_QCOM_EMAC is not set CONFIG_QCOM_FASTRPC=m # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set @@ -9470,6 +9471,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m CONFIG_XILINX_WATCHDOG=m +# CONFIG_XILINX_WINDOW_WATCHDOG is not set CONFIG_XILINX_XADC=m CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index ef96698a0..4d5d6b262 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -4879,7 +4879,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -5793,6 +5793,7 @@ CONFIG_QCOM_CLK_APCS_MSM8916=m # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set # CONFIG_QCOM_EBI2 is not set +# CONFIG_QCOM_EMAC is not set CONFIG_QCOM_FASTRPC=m # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set @@ -9248,6 +9249,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set CONFIG_XILINX_XADC=m CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index f9dca9350..12ba4967d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -4855,7 +4855,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -5768,6 +5768,7 @@ CONFIG_QCOM_CLK_APCS_MSM8916=m # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set # CONFIG_QCOM_EBI2 is not set +# CONFIG_QCOM_EMAC is not set CONFIG_QCOM_FASTRPC=m # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set @@ -9221,6 +9222,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set CONFIG_XILINX_XADC=m CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c68d07b51..e473a1968 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4207,7 +4207,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -4969,6 +4969,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -7943,6 +7944,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2e0343cf8..7bc794f54 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -7149,6 +7149,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index dd79ba7f1..d08503759 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4179,7 +4179,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -4940,6 +4940,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -7912,6 +7913,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1a0bb5ddd..7c919432f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -7126,6 +7126,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index ba8728792..49d66841b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4184,7 +4184,7 @@ CONFIG_NET_VENDOR_NETERION=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y # CONFIG_NET_VENDOR_QLOGIC is not set -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y # CONFIG_NET_VENDOR_RDC is not set # CONFIG_NET_VENDOR_REALTEK is not set # CONFIG_NET_VENDOR_RENESAS is not set @@ -4893,6 +4893,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -7892,6 +7893,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index db28a4338..6f79d653b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -7138,6 +7138,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index f67310f78..01bfd0a35 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4156,7 +4156,7 @@ CONFIG_NET_VENDOR_NETERION=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y # CONFIG_NET_VENDOR_QLOGIC is not set -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y # CONFIG_NET_VENDOR_RDC is not set # CONFIG_NET_VENDOR_REALTEK is not set # CONFIG_NET_VENDOR_RENESAS is not set @@ -4864,6 +4864,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -7861,6 +7862,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index c54922faf..b6e5cb3f7 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -7115,6 +7115,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a22ffd1a2..08bbced8c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -7142,6 +7142,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 972bb7355..7ad6f614f 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4526,7 +4526,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -5319,6 +5319,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -8468,6 +8469,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 5df3ba124..aec8ee23a 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -7469,6 +7469,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d34e4f5e4..ce6359576 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4500,7 +4500,7 @@ CONFIG_NET_VENDOR_OKI=y CONFIG_NET_VENDOR_PACKET_ENGINES=y CONFIG_NET_VENDOR_PENSANDO=y CONFIG_NET_VENDOR_QLOGIC=y -# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_NET_VENDOR_RENESAS is not set @@ -5291,6 +5291,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set @@ -8438,6 +8439,7 @@ CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set CONFIG_XILINX_VCU=m # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set CONFIG_XILINX_XDMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 4ec122ab1..3913ae59c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -7445,6 +7445,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 7828086d9..062ded1ea 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -7687,6 +7687,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index f6247fd4c..f54327eba 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -7663,6 +7663,7 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILINX_SDFEC is not set # CONFIG_XILINX_VCU is not set # CONFIG_XILINX_WATCHDOG is not set +# CONFIG_XILINX_WINDOW_WATCHDOG is not set # CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DMA is not set diff --git a/kernel.spec b/kernel.spec index 230b06b18..bca4ae276 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc0.20230706gitc17414a273b8.12 +%define pkgrelease 0.rc1.11 %define kversion 6 -%define tarfile_release 6.4-12069-gc17414a273b8 +%define tarfile_release 6.5-rc1 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20230706gitc17414a273b8.12%{?buildid}%{?dist} +%define specrelease 0.rc1.11%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3732,11 +3732,23 @@ fi\ # # %changelog -* Thu Jul 06 2023 Justin M. Forbes [6.5.0-0.rc0.20230706gitc17414a273b8.12] -- redhat: add intel-m10-bmc-hwmon to filter-modules singlemods list (Patrick Talbert) - -* Thu Jul 06 2023 Fedora Kernel Team [6.5.0-0.rc0.c17414a273b8.12] +* Mon Jul 10 2023 Justin M. Forbes [6.5.0-0.rc1.11] +- redhat: set CONFIG_XILINX_WINDOW_WATCHDOG as disabled in pending (Patrick Talbert) +- Add baseline ARK/ELN pipelines (Michael Hofmann) +- Simplify job rules (Michael Hofmann) +- Build ELN srpm for bot changes (Michael Hofmann) +- Run RH selftests for ELN (Michael Hofmann) +- Simplify job templates (Michael Hofmann) +- Extract rules to allow orthogonal configuration (Michael Hofmann) +- Require ELN pipelines if started automatically (Michael Hofmann) +- Add ARK debug pipeline (Michael Hofmann) +- Extract common parts of child pipeline job (Michael Hofmann) +- Move ARK pipeline variables into job template (Michael Hofmann) +- Simplify ARK pipeline rules (Michael Hofmann) - Change pathfix.py to %%py3_shebang_fix (Justin M. Forbes) +- Turn on NET_VENDOR_QUALCOMM for Fedora to enable rmnet (Justin M. Forbes) +- redhat: add intel-m10-bmc-hwmon to filter-modules singlemods list (Patrick Talbert) +- Linux v6.5.0-0.rc1 * Thu Jul 06 2023 Fedora Kernel Team [6.5.0-0.rc0.c17414a273b8.11] - fedira: enable pending-fedora CONFIG_CPUFREQ_DT_PLATDEV as a module (Patrick Talbert) diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index e3a2cb7bb..f36120381 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -64,7 +64,7 @@ 63 files changed, 1542 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 85fb0fa5d091..d2ca6b3b4d94 100644 +index a1457995fd41..33e37745deff 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6599,6 +6599,15 @@ @@ -117,7 +117,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 12579666581f..f2273a60d6e3 100644 +index 47690c28456a..f68f41eef27a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -209,7 +209,7 @@ index 85a00d97a314..bbb1c69afb62 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index fe10da1a271e..e2c6068201c0 100644 +index 00d76448319d..e679d13303e3 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -419,10 +419,10 @@ index c2c786eb95ab..4e3aa80cd5cf 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 1c3e1e2bb0b5..163d43c671a8 100644 +index 5b145f1aaa1b..59cb691d7f07 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1746,6 +1746,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1748,6 +1748,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; diff --git a/sources b/sources index f92b38661..7b8d1f03b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-12069-gc17414a273b8.tar.xz) = f0493a17440c163d56aeb45b89ff57846ca4dc5d27bea423b9340910502935a37a97f298945c3cced85b9c0221d197cde1052eaf60b50eb123272115b02eaa43 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = a3b07102371e1eade1620272cdb8a0f6741ffe1877d6d53099cbfab6a382e67c4edbac86fbf9008e785293926bf5978cb970648d0e8e696816a8fb07decf9e2f -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 3bd5e2956fbcc80fa106e53d3f982fc7b5e01d264c3abe1c03eb60473b853173872ff002394179132eb4ff8bc1de5ae3e76f6d06436bef4d891fea6c7889dcf5 +SHA512 (linux-6.5-rc1.tar.xz) = b90341bf0031c656f33693b5975eb02eb61d1c320eb302a68fd5569f1ae99baa0e87cc3564200530f69cb8f88febf9a3417d7d77e2947fb69d2efd3bf4b862bd +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = aa40a40f0d03e7b0efa08db9b8c5062e07fa7690b779edeb4c50c2bc97872e24f369e9a5b49a31e7a79b48ccf7fedb6cdcdb6a954faeb7db48f16f8684b80892 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 9b451c196f1d420771785daa116fe5b3b4ec8e54b407eced5065055bb91b12f0337d583934ce3bcae6462d33378184603b68e54c2f34ded4e01961a64a1c4433