diff --git a/Makefile.rhelver b/Makefile.rhelver index 120602760..1232f7a10 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 = 29 +RHEL_RELEASE = 31 # # RHEL_REBASE_NUM diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 28e05e18c..ed81001dd 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3113,7 +3113,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m -# CONFIG_INTEL_MEI_VSC_HW is not set +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_WDT=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m @@ -3160,7 +3161,7 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -# CONFIG_INTEL_VSC is not set +CONFIG_INTEL_VSC=m CONFIG_INTEL_VSEC=m CONFIG_INTEL_WMI_SBL_FW_UPDATE=m CONFIG_INTEL_WMI_THUNDERBOLT=m @@ -8540,7 +8541,7 @@ CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_OG01A1B=m -# CONFIG_VIDEO_OV01A10 is not set +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -8550,7 +8551,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -# CONFIG_VIDEO_OV2740 is not set +CONFIG_VIDEO_OV2740=m CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d7b3871b5..6d9662a63 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3093,7 +3093,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m -# CONFIG_INTEL_MEI_VSC_HW is not set +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_WDT=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m @@ -3140,7 +3141,7 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -# CONFIG_INTEL_VSC is not set +CONFIG_INTEL_VSC=m CONFIG_INTEL_VSEC=m CONFIG_INTEL_WMI_SBL_FW_UPDATE=m CONFIG_INTEL_WMI_THUNDERBOLT=m @@ -8510,7 +8511,7 @@ CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_OG01A1B=m -# CONFIG_VIDEO_OV01A10 is not set +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -8520,7 +8521,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -# CONFIG_VIDEO_OV2740 is not set +CONFIG_VIDEO_OV2740=m CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel.changelog b/kernel.changelog index 0b1e79b3b..31fed72aa 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,12 @@ +* Mon Jun 10 2024 Fedora Kernel Team [6.10.0-0.rc3.31] +- Linux v6.10.0-0.rc3 +Resolves: + +* Sun Jun 09 2024 Fedora Kernel Team [6.10.0-0.rc2.771ed66105de.30] +- redhat/configs: fedora: Enable some drivers for IPU6 support (Hans de Goede) +- Linux v6.10.0-0.rc2.771ed66105de +Resolves: + * Sat Jun 08 2024 Fedora Kernel Team [6.10.0-0.rc2.dc772f8237f9.29] - Linux v6.10.0-0.rc2.dc772f8237f9 Resolves: diff --git a/kernel.spec b/kernel.spec index 44d7dd758..2d6cea602 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc2.20240608gitdc772f8237f9.29 +%define pkgrelease 0.rc3.31 %define kversion 6 -%define tarfile_release 6.10-rc2-315-gdc772f8237f9 +%define tarfile_release 6.10-rc3 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240608gitdc772f8237f9.29%{?buildid}%{?dist} +%define specrelease 0.rc3.31%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4018,6 +4018,13 @@ fi\ # # %changelog +* Mon Jun 10 2024 Fedora Kernel Team [6.10.0-0.rc3.31] +- Linux v6.10.0-0.rc3 + +* Sun Jun 09 2024 Fedora Kernel Team [6.10.0-0.rc2.771ed66105de.30] +- redhat/configs: fedora: Enable some drivers for IPU6 support (Hans de Goede) +- Linux v6.10.0-0.rc2.771ed66105de + * Sat Jun 08 2024 Fedora Kernel Team [6.10.0-0.rc2.dc772f8237f9.29] - Linux v6.10.0-0.rc2.dc772f8237f9 diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index c76b8b852..e0ea74321 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -138,7 +138,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 7f921ae547f1..fef30ddf5c46 100644 +index 925a75b8ba7d..2d4c5b9dde83 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -4163,7 +4163,7 @@ index 000000000000..5c44026c6c81 + +#endif /* __RH_MESSAGES_H */ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 937294ff164f..eaccbb8639d3 100644 +index f48d72d22dc2..288e0dbe6463 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -4174,7 +4174,7 @@ index 937294ff164f..eaccbb8639d3 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1992,6 +1993,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1993,6 +1994,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -4187,7 +4187,7 @@ index 937294ff164f..eaccbb8639d3 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2052,6 +2059,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2053,6 +2060,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 9d814ce28..7943fbf6e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.10-rc2-315-gdc772f8237f9.tar.xz) = 0147ae19341248d9302af1a39fe7070400ea7c321aa220515d844a986ddb9dd39d3ca1bad6cb4b92b5421dfb80505f783d7f2abbe8c9d8a9bd97ff780f686548 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 1f5cc55244d75faf6c5c4d6a83ad6698e6e8ee2fb8bd405073edb7720b9de95adb0836e83e417cfa8dc823f2f98a5935b270f621fb5c686cc156a3bc9d850497 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = bc538abcd4ccd5cf779416476548b3df5149ad81739dcf8ad3e1277da42a9e24ccf897c83257985a0de9c2d486f12c00d91e76838c8adbba73522e0f1014d942 +SHA512 (linux-6.10-rc3.tar.xz) = 37dd448c6f0a17b5377da3520133e7077f07cf44ebddbde4c1b114a8650f9cda266846cf8bbdcf0bbccfe78d224f1d320629c71f540f602416aa3bae4d2a837d +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = cd8a1ca002f967d578dec21f1d06d17f9fc307ac7501c4da170265ca590550617512107a4776e134cb1a9e826ed6dbe4952b67229602e5fe35344091c52ffeb5 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 886dc1624a5a06821f6ddd2b4f94acb142408b115a49c2db266106d6b9255f282b314c03f531556cd5bbc383dbe50d2f6f2054f5fe94ec48df3d2c4d93c9423e