diff --git a/Makefile.rhelver b/Makefile.rhelver index 66dd6c7e7..cb5bf1f10 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 = 33 +RHEL_RELEASE = 36 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 4167e4ff2..414c83f21 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -907,6 +907,7 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m @@ -4592,6 +4593,7 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index e2ea01f6d..7815672c7 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -907,6 +907,7 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m @@ -4569,6 +4570,7 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 7daae4f33..5ca135e36 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1162,7 +1162,7 @@ CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y -CONFIG_CLK_IMX93=m +CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_LS1028A_PLLDIG=y CONFIG_CLK_PX30=y @@ -3149,7 +3149,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7ULP_WDT=m CONFIG_IMX8MM_THERMAL=m -# CONFIG_IMX8QXP_ADC is not set +CONFIG_IMX8QXP_ADC=m CONFIG_IMX93_ADC=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m @@ -5656,8 +5656,8 @@ CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8QXP=y -# CONFIG_PINCTRL_IMX8ULP is not set -CONFIG_PINCTRL_IMX93=m +CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set # CONFIG_PINCTRL_IPQ4019 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 652bd63f2..4dea68e5e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -904,6 +904,7 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m @@ -4588,6 +4589,7 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 590b14480..4dd8c55d2 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1162,7 +1162,7 @@ CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y -CONFIG_CLK_IMX93=m +CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_LS1028A_PLLDIG=y CONFIG_CLK_PX30=y @@ -3132,7 +3132,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7ULP_WDT=m CONFIG_IMX8MM_THERMAL=m -# CONFIG_IMX8QXP_ADC is not set +CONFIG_IMX8QXP_ADC=m CONFIG_IMX93_ADC=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m @@ -5629,8 +5629,8 @@ CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8QXP=y -# CONFIG_PINCTRL_IMX8ULP is not set -CONFIG_PINCTRL_IMX93=m +CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set # CONFIG_PINCTRL_IPQ4019 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 04e92f0ea..125a05a62 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -904,6 +904,7 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m @@ -4565,6 +4566,7 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index fa5e22d9f..bfeed9144 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -915,6 +915,7 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m @@ -4709,6 +4710,7 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index b66af13d8..520218aa1 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -915,6 +915,7 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m @@ -4686,6 +4687,7 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8ULP=y CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 0f881b211..232562f0d 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1154,8 +1154,9 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y -CONFIG_CLK_IMX93=m +CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set @@ -3105,7 +3106,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7ULP_WDT=m CONFIG_IMX8MM_THERMAL=m -# CONFIG_IMX8QXP_ADC is not set +CONFIG_IMX8QXP_ADC=m CONFIG_IMX93_ADC=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m @@ -5632,8 +5633,9 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y -# CONFIG_PINCTRL_IMX8ULP is not set -CONFIG_PINCTRL_IMX93=m +CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set # CONFIG_PINCTRL_IPQ4019 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index ad01bd132..b1d7c1729 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1154,8 +1154,9 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y -CONFIG_CLK_IMX93=m +CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set @@ -3089,7 +3090,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7ULP_WDT=m CONFIG_IMX8MM_THERMAL=m -# CONFIG_IMX8QXP_ADC is not set +CONFIG_IMX8QXP_ADC=m CONFIG_IMX93_ADC=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m @@ -5607,8 +5608,9 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y -# CONFIG_PINCTRL_IMX8ULP is not set -CONFIG_PINCTRL_IMX93=m +CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set # CONFIG_PINCTRL_IPQ4019 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 8e96e10c5..d3f417831 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1129,8 +1129,9 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y -CONFIG_CLK_IMX93=m +CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set @@ -3050,7 +3051,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7ULP_WDT=m CONFIG_IMX8MM_THERMAL=m -# CONFIG_IMX8QXP_ADC is not set +CONFIG_IMX8QXP_ADC=m CONFIG_IMX93_ADC=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m @@ -5516,8 +5517,9 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y -# CONFIG_PINCTRL_IMX8ULP is not set -CONFIG_PINCTRL_IMX93=m +CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set # CONFIG_PINCTRL_IPQ4019 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 94fa5d00d..ec6059ad8 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1129,8 +1129,9 @@ CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y -CONFIG_CLK_IMX93=m +CONFIG_CLK_IMX93=y CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set @@ -3034,7 +3035,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7ULP_WDT=m CONFIG_IMX8MM_THERMAL=m -# CONFIG_IMX8QXP_ADC is not set +CONFIG_IMX8QXP_ADC=m CONFIG_IMX93_ADC=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m @@ -5491,8 +5492,9 @@ CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y -# CONFIG_PINCTRL_IMX8ULP is not set -CONFIG_PINCTRL_IMX93=m +CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set # CONFIG_PINCTRL_IPQ4019 is not set diff --git a/kernel.spec b/kernel.spec index e6b687b39..1bbf44d35 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.rc4.20230804gitc1a515d3c027.33 +%define pkgrelease 0.rc5.36 %define kversion 6 -%define tarfile_release 6.5-rc4-174-gc1a515d3c027 +%define tarfile_release 6.5-rc5 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20230804gitc1a515d3c027.33%{?buildid}%{?dist} +%define specrelease 0.rc5.36%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3740,6 +3740,16 @@ fi\ # # %changelog +* Mon Aug 07 2023 Fedora Kernel Team [6.5.0-0.rc5.36.el127] +- Linux v6.5.0-0.rc5 + +* Sun Aug 06 2023 Fedora Kernel Team [6.5.0-0.rc4.f0ab9f34e59e.35.el127] +- Linux v6.5.0-0.rc4.f0ab9f34e59e + +* Sat Aug 05 2023 Fedora Kernel Team [6.5.0-0.rc4.024ff300db33.34.el127] +- arm: i.MX: Some minor NXP i.MX cleanups (Peter Robinson) +- Linux v6.5.0-0.rc4.024ff300db33 + * Fri Aug 04 2023 Fedora Kernel Team [6.5.0-0.rc4.c1a515d3c027.33.el127] - Linux v6.5.0-0.rc4.c1a515d3c027 diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index 04e5df9ac..668a5c76e 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -118,7 +118,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 653238528aac..f64aaa59e0e3 100644 +index 6bbf9db6b414..e321cd641d46 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1731,7 +1731,7 @@ index b2a3988e1e15..cc22e1ac8fb9 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 68b12afa0721..1f321832f69c 100644 +index 3c668cfb146d..95724cd9875f 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -130,6 +130,14 @@ static const char *sd_cache_types[] = { @@ -1749,7 +1749,7 @@ index 68b12afa0721..1f321832f69c 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -3958,6 +3966,8 @@ static int __init init_sd(void) +@@ -3961,6 +3969,8 @@ static int __init init_sd(void) goto err_out_class; } diff --git a/sources b/sources index 46d7fb5a1..d93056ea8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc4-174-gc1a515d3c027.tar.xz) = 20b9e8195b10d99a202057536864ac7276c7d7e4b5300f8309f96d9b2f93491bdf415264aae915d6e3b9734bbef7832ce522c39219ff3a0a3f9eafcd0d0bfe8f -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 1b2eb1dc7a3e9f3c78ed0793ca6eb40b94f349248c7670451e7a1e5c70be421237f48e0cf256aba25b7568178d3fa4b13153e460995639572fa3843d2c37a415 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 0dca5cd8f9394afde40acdac7336d2ad5aa99cbd4bd86d17b2fe3b16dda6fcd263ce1db85cc473ef55fff42c0c915472e884310fb9d2544315816a55eca3e95d +SHA512 (linux-6.5-rc5.tar.xz) = 4a6d353c54a99670150a1679c34aa30df9e26b3fa2b9c32c3521ea6f0f7ac1861306981a734ed7b6419fb630274f2f8331420bcf5f03e860eb2460e089dd11d7 +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 07efaad282106ad37ffad3c1c53c496ee29bdb215f3e3d231a835e2d8774466c81b754b6703f75d9718dd598f4e719d8841de330baecc61ed0eb4c23debfc2d6 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 58ce4190b1724b570b8308f4ffbc03e579d28ef6d31e576d4b3ecff0c83fe792654b125c3f553efcb0d838b6b503aa78d5e3884d3045c1aac0ced299602d1e47