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/Patchlist.changelog b/Patchlist.changelog index 07b8cb45e..0e6c6aa01 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/232af2fa6d1f9b495c21adbfbc1467df7c3262f5 - 232af2fa6d1f9b495c21adbfbc1467df7c3262f5 x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/f42ac61adbc8d2c4a60cb965d4a55b9639bade57 + f42ac61adbc8d2c4a60cb965d4a55b9639bade57 x86/insn_decoder_test: allow longer symbol-names https://gitlab.com/cki-project/kernel-ark/-/commit/4d11b5eee76ec8a293d0dce03f16995e5c94b07b 4d11b5eee76ec8a293d0dce03f16995e5c94b07b crypto: rng - Fix extrng EFAULT handling diff --git a/kernel.changelog b/kernel.changelog index 825038599..a00c44412 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,20 @@ -* Fri Dec 20 2024 Fedora Kernel Team [6.13.0-0.rc3.8faabc041a00.33] +* Mon Dec 23 2024 Fedora Kernel Team [6.13.0-0.rc4.36] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Mon Dec 23 2024 Fedora Kernel Team [6.13.0-0.rc4.35] +- Linux v6.13.0-0.rc4 +Resolves: + +* Sun Dec 22 2024 Fedora Kernel Team [6.13.0-0.rc3.48f506ad0b68.34] +- Linux v6.13.0-0.rc3.48f506ad0b68 +Resolves: + +* Sat Dec 21 2024 Fedora Kernel Team [6.13.0-0.rc3.499551201b5f.33] +- Linux v6.13.0-0.rc3.499551201b5f +Resolves: + * Fri Dec 20 2024 Fedora Kernel Team [6.13.0-0.rc3.8faabc041a00.32] - Linux v6.13.0-0.rc3.8faabc041a00 Resolves: diff --git a/kernel.spec b/kernel.spec index c30b290f9..fecb18556 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.13.0 %define specversion 6.13.0 %define patchversion 6.13 -%define pkgrelease 0.rc3.20241220git8faabc041a00.33 +%define pkgrelease 0.rc4.36 %define kversion 6 -%define tarfile_release 6.13-rc3-136-g8faabc041a00 +%define tarfile_release 6.13-rc4 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20241220git8faabc041a00.33%{?buildid}%{?dist} +%define specrelease 0.rc4.36%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4171,10 +4171,19 @@ fi\ # # %changelog -* Fri Dec 20 2024 Fedora Kernel Team [6.13.0-0.rc3.8faabc041a00.33] +* Mon Dec 23 2024 Fedora Kernel Team [6.13.0-0.rc4.36] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Mon Dec 23 2024 Fedora Kernel Team [6.13.0-0.rc4.35] +- Linux v6.13.0-0.rc4 + +* Sun Dec 22 2024 Fedora Kernel Team [6.13.0-0.rc3.48f506ad0b68.34] +- Linux v6.13.0-0.rc3.48f506ad0b68 + +* Sat Dec 21 2024 Fedora Kernel Team [6.13.0-0.rc3.499551201b5f.33] +- Linux v6.13.0-0.rc3.499551201b5f + * Fri Dec 20 2024 Fedora Kernel Team [6.13.0-0.rc3.8faabc041a00.32] - Linux v6.13.0-0.rc3.8faabc041a00 diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index d34ff13de..fb581c865 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -190,7 +190,7 @@ index 000000000000..fd77bd5c97e2 + +endmenu diff --git a/Makefile b/Makefile -index e5b8a8832c0c..8c3c3bb63e30 100644 +index 5c9b1d2d59b4..4ada11c61aa6 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1979,7 +1979,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index d169a30eb935..a57650116e76 100644 +index a970168a3014..6b5f6ce38e6b 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -276,6 +276,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -4588,7 +4588,7 @@ index 000000000000..84e22b1730cc +} +late_initcall(__add_rh_flag); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index fb787a5715f5..d57cf26a676e 100644 +index 94ee49207a45..e1af88a08e5e 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -27,6 +27,7 @@ @@ -4599,7 +4599,7 @@ index fb787a5715f5..d57cf26a676e 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1902,6 +1903,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1903,6 +1904,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -4612,7 +4612,7 @@ index fb787a5715f5..d57cf26a676e 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -1970,6 +1977,7 @@ static void write_mod_c_file(struct module *mod) +@@ -1971,6 +1978,7 @@ static void write_mod_c_file(struct module *mod) } add_srcversion(&buf, mod); diff --git a/sources b/sources index f1450e205..74d9f8a4b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc3-136-g8faabc041a00.tar.xz) = 327ceddf300a253e43247dbf888b2004a8b8255aa3eed7116bf8cde523bf7e384d6c51df6c054c904f52bea1a8842cdf5802c9e4ef4985442203d8d228bb5d21 -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 7d9f402e6425b19a3b334ce13d9ca07c5af3b50eeaf721d34a8390cc32699f40195318a65f09374db6e541b7a84e6d1bccdda5511e29d641650b89af0076e4a5 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 1bc45103dd5dcfdaf47e287c05dc4f06232b6cf5c79065bd9a01348a2a2dd1732ad0791f6c025a3996c8eac0d27c0e9749a5a44544aefa9bc58a74169fcc8734 +SHA512 (linux-6.13-rc4.tar.xz) = f4b6cd5a599ec5a34d4837228aad388d4eff9ca3b2aa902bdbf32341c6737c43042528ad19d30f1f7e1adc13e2021c5c0d82dc553859130a3d15c513e24b34e7 +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 6da8de2ce82c9d2ffe24c2ada5fa77c7abceee345d2514a8e98a4159e3dae860f1cea7bbeb5970dfa45974917e9ff1e5940ad63d228be4a7471e587733db4dd6 +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 6585e484100831bfee79b2aab33325bda821ea90cd23f45d180fbd4c0e386fa78694a17f45444a0c260e384f1eedda9e2e9600d6e15b872a9c7a659f8c952268