diff --git a/Makefile.rhelver b/Makefile.rhelver index b21fb92df..f50761d69 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 = 45 +RHEL_RELEASE = 46 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 9bc1e18c3..c060da037 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,11 @@ -* Wed May 07 2025 Fedora Kernel Team [6.15.0-0.rc5.0d8d44db295c.45] +* Thu May 08 2025 Fedora Kernel Team [6.15.0-0.rc5.d76bb1ebb558.46] - Shorten the uname for git snapshots (Justin M. Forbes) Resolves: +* Thu May 08 2025 Fedora Kernel Team [6.15.0-0.rc5.d76bb1ebb558.45] +- Linux v6.15.0-0.rc5.d76bb1ebb558 +Resolves: + * Wed May 07 2025 Fedora Kernel Team [6.15.0-0.rc5.0d8d44db295c.44] - Linux v6.15.0-0.rc5.0d8d44db295c Resolves: diff --git a/kernel.spec b/kernel.spec index 8de8d5467..0558d1b50 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.15.0 %define specversion 6.15.0 %define patchversion 6.15 -%define pkgrelease 0.rc5.250507g0d8d44db295c.45 +%define pkgrelease 0.rc5.250508gd76bb1ebb558.46 %define kversion 6 -%define tarfile_release 6.15-rc5-32-g0d8d44db295c +%define tarfile_release 6.15-rc5-43-gd76bb1ebb558 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.250507g0d8d44db295c.45%{?buildid}%{?dist} +%define specrelease 0.rc5.250508gd76bb1ebb558.46%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4230,9 +4230,12 @@ fi\ # # %changelog -* Wed May 07 2025 Fedora Kernel Team [6.15.0-0.rc5.0d8d44db295c.45] +* Thu May 08 2025 Fedora Kernel Team [6.15.0-0.rc5.d76bb1ebb558.46] - Shorten the uname for git snapshots (Justin M. Forbes) +* Thu May 08 2025 Fedora Kernel Team [6.15.0-0.rc5.d76bb1ebb558.45] +- Linux v6.15.0-0.rc5.d76bb1ebb558 + * Wed May 07 2025 Fedora Kernel Team [6.15.0-0.rc5.0d8d44db295c.44] - Linux v6.15.0-0.rc5.0d8d44db295c diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 02e22c247..97bc08bcd 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -2249,10 +2249,10 @@ index c845c5daaeba..00e14194265f 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index cadec6b1b554..e35b381d9717 100644 +index da6ee7c39290..629e7b2bbda6 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c -@@ -570,6 +570,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -569,6 +569,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) { struct inode *inode; struct erofs_sb_info *sbi = EROFS_SB(sb); @@ -2262,7 +2262,7 @@ index cadec6b1b554..e35b381d9717 100644 int err; sb->s_magic = EROFS_SUPER_MAGIC; -@@ -674,6 +677,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -673,6 +676,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) return err; erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid); diff --git a/sources b/sources index e30fb8426..b31124183 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc5-32-g0d8d44db295c.tar.xz) = f2e21163cd1437356f379b17fa7e24c92d81acbe2b5088c878151b6e1391fe91bc2bdd6b6a5b83f2c12a604528d9e12a7e7fc2b67f5f776bdb3b08b52e6ee0f5 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = d739a7f42ae0415a1b9637fd29df5737de23c9b8f76d54d56a6719b5df6b487cada5d77cdb5f78092354d8cfe7abc38c9b4a6e28076be89428677ee049212ccf -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 13b1a31600377740ffa3e0a44999b7e1602d46e21e6cbb157c9401911b5bb836d3de109fadb40800dc79e5dd576a7a61fb68401614632ddd5e9dc15cfb485dbc +SHA512 (linux-6.15-rc5-43-gd76bb1ebb558.tar.xz) = 55f009cb5149219805373f4599162a8c37a798fa74cbae342e23d61a4cb69356d4442b086bd1c2723c9c7efe821533e5d0fbaaca3109b0a546b00b8e15d744c4 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 9d7c5aa75e427815e45d5b242f2ade7e415bb9bc4bb389483565c51930d018b61aaebe41021e57560d620dffbc5e74ca19bc4ffa9d9585fae970d96e3ee7b10e +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = cfb460c6fd2120a0f615ba2d9c44cccc5b5de3930c50af87793f886c153b67ecc4f6c63b9457aa7167dd6ae48109c354b1b19934862f24520b6600d796955c65