From 38035ff4a39b43d240619657e748b0e5e39b1543 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 2 Oct 2023 06:56:19 -0500 Subject: [PATCH] kernel-6.6.0-0.rc4.33 * Mon Oct 02 2023 Fedora Kernel Team [6.6.0-0.rc4.33] - Linux v6.6.0-0.rc4 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 4 ++-- kernel-aarch64-16k-fedora.config | 4 ++-- kernel-aarch64-debug-fedora.config | 4 ++-- kernel-aarch64-fedora.config | 4 ++-- kernel.spec | 16 +++++++++++++--- patch-6.6-redhat.patch | 14 +++++++------- sources | 6 +++--- 8 files changed, 32 insertions(+), 22 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 64f1f44ac..66dd6c7e7 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 = 30 +RHEL_RELEASE = 33 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 68942ee22..7191737c2 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -8538,11 +8538,11 @@ CONFIG_TIPC=m CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_PRUSS_INTC=m CONFIG_TI_PRUSS=m -CONFIG_TI_SCI_CLK=m # CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set +CONFIG_TI_SCI_CLK=y CONFIG_TI_SCI_INTA_IRQCHIP=y CONFIG_TI_SCI_INTR_IRQCHIP=y -CONFIG_TI_SCI_PM_DOMAINS=m +CONFIG_TI_SCI_PM_DOMAINS=y CONFIG_TI_SCI_PROTOCOL=y # CONFIG_TI_ST is not set CONFIG_TI_SYSCON_CLK=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 6b6f6250b..2387e78da 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -8509,11 +8509,11 @@ CONFIG_TIPC=m CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_PRUSS_INTC=m CONFIG_TI_PRUSS=m -CONFIG_TI_SCI_CLK=m # CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set +CONFIG_TI_SCI_CLK=y CONFIG_TI_SCI_INTA_IRQCHIP=y CONFIG_TI_SCI_INTR_IRQCHIP=y -CONFIG_TI_SCI_PM_DOMAINS=m +CONFIG_TI_SCI_PM_DOMAINS=y CONFIG_TI_SCI_PROTOCOL=y # CONFIG_TI_ST is not set CONFIG_TI_SYSCON_CLK=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a29ac2c3e..1041bbeaf 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -8538,11 +8538,11 @@ CONFIG_TIPC=m CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_PRUSS_INTC=m CONFIG_TI_PRUSS=m -CONFIG_TI_SCI_CLK=m # CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set +CONFIG_TI_SCI_CLK=y CONFIG_TI_SCI_INTA_IRQCHIP=y CONFIG_TI_SCI_INTR_IRQCHIP=y -CONFIG_TI_SCI_PM_DOMAINS=m +CONFIG_TI_SCI_PM_DOMAINS=y CONFIG_TI_SCI_PROTOCOL=y # CONFIG_TI_ST is not set CONFIG_TI_SYSCON_CLK=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 5da926cd8..3b684a963 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -8509,11 +8509,11 @@ CONFIG_TIPC=m CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_PRUSS_INTC=m CONFIG_TI_PRUSS=m -CONFIG_TI_SCI_CLK=m # CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set +CONFIG_TI_SCI_CLK=y CONFIG_TI_SCI_INTA_IRQCHIP=y CONFIG_TI_SCI_INTR_IRQCHIP=y -CONFIG_TI_SCI_PM_DOMAINS=m +CONFIG_TI_SCI_PM_DOMAINS=y CONFIG_TI_SCI_PROTOCOL=y # CONFIG_TI_ST is not set CONFIG_TI_SYSCON_CLK=m diff --git a/kernel.spec b/kernel.spec index ee3e29f9d..868e4e086 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.rc3.20230929git9ed22ae6be81.30 +%define pkgrelease 0.rc4.33 %define kversion 6 -%define tarfile_release 6.6-rc3-55-g9ed22ae6be81 +%define tarfile_release 6.6-rc4 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20230929git9ed22ae6be81.30%{?buildid}%{?dist} +%define specrelease 0.rc4.33%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.6.0 @@ -3697,6 +3697,16 @@ fi\ # # %changelog +* Mon Oct 02 2023 Fedora Kernel Team [6.6.0-0.rc4.33] +- Linux v6.6.0-0.rc4 + +* Sun Oct 01 2023 Fedora Kernel Team [6.6.0-0.rc3.e402b08634b3.32] +- Linux v6.6.0-0.rc3.e402b08634b3 + +* Sat Sep 30 2023 Fedora Kernel Team [6.6.0-0.rc3.9f3ebbef746f.31] +- fedora: Switch TI_SCI_CLK and TI_SCI_PM_DOMAINS symbols to built-in (Javier Martinez Canillas) +- Linux v6.6.0-0.rc3.9f3ebbef746f + * Fri Sep 29 2023 Fedora Kernel Team [6.6.0-0.rc3.9ed22ae6be81.30] - Linux v6.6.0-0.rc3.9ed22ae6be81 diff --git a/patch-6.6-redhat.patch b/patch-6.6-redhat.patch index 57df7ef93..2ff318907 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 3de08c780c74..763471c11b7c 100644 +index 373649c7374e..6c81485add7c 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -234,7 +234,7 @@ index de6ad0fb2328..5cc2758be027 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 382d4e6b848d..e73c87159175 100644 +index 4e5ffc8b0e46..b6f895184ab0 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1601,6 +1601,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -1645,7 +1645,7 @@ index 675332e49a7b..4a3cbddacef1 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index c92a317ba547..8fa8c1d9c9a5 100644 +index 83b6a3f3863b..457285298ac7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -1663,7 +1663,7 @@ index c92a317ba547..8fa8c1d9c9a5 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -3949,6 +3957,8 @@ static int __init init_sd(void) +@@ -4012,6 +4020,8 @@ static int __init init_sd(void) goto err_out_class; } @@ -3126,7 +3126,7 @@ index 000000000000..616692b1ac11 + +#endif /* __RH_MESSAGES_H */ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index de499dce5265..e3cee099f90d 100644 +index b3dee80497cb..3715db3f99d4 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -23,6 +23,7 @@ @@ -3137,7 +3137,7 @@ index de499dce5265..e3cee099f90d 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -2077,6 +2078,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2088,6 +2089,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -3150,7 +3150,7 @@ index de499dce5265..e3cee099f90d 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2137,6 +2144,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2148,6 +2155,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/sources b/sources index 4ccc9d1fd..a9b1bb180 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.6-rc3-55-g9ed22ae6be81.tar.xz) = 1a12ba72f10eaad9d4b9be0944e62c2ed5db24831a9bb58d50a13b39bc701bc6821ad25b23ba2559d3d005b846c928b0210c688fd3cc5da0cdda2ff93b0e9900 -SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = d83366aed7fd87035129392555a2a379275ec7b66d8fdff89967888bdaa1dbc4ee39413ce6f84e4c40bc1d32c99ec700ef56e93550d09ada4869c67d240ee601 -SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 820a7d58a7e0940385577554706d6123b136af953a8fdcbe733c849dad6290aa847f03fd918b61e30cafe48be2132783e109fb421a1b1546443572b557ae9ec1 +SHA512 (linux-6.6-rc4.tar.xz) = 50e5896ff49ce1e7424e921c6b701bf4313c3bbc16ad883130ad37e00bece97447b53c730eeafdae3c35475e9a00e8a205db5fe0d1249ab25c9f32d45f04e439 +SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 0913466fae4e3831a7e362b97e74da204aabfc22ece569a3f97f95723831d9f9e45bace7360f1a3089796ea3460718f08dfc2c1656e59402cc94c38c13420c2b +SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 8c351996abfa1d279296f59357c52932963e12594cde7c807d2abfa65581741e25fecd33f6a7faf8e8997c538c657a64464beb9c5933d7781ffc92cb7d5576f5