diff --git a/Makefile.rhelver b/Makefile.rhelver index 7a33d54ff..d31d3c7af 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 = 57 +RHEL_RELEASE = 58 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index bfe4c771a..181ffb625 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/ea885d6b94e8992978bad32e7026df3b03b1d71d - ea885d6b94e8992978bad32e7026df3b03b1d71d powerpc: Fix struct termio related ioctl macros +https://gitlab.com/cki-project/kernel-ark/-/commit/82b5c32dac7854967d7152cd9e3d72fe6051f903 + 82b5c32dac7854967d7152cd9e3d72fe6051f903 Revert "loop: Add sanity check for read/write_iter" + +https://gitlab.com/cki-project/kernel-ark/-/commit/b10ab0c5ed1faf5d5b3cf3ddcf133b33c5404c27 + b10ab0c5ed1faf5d5b3cf3ddcf133b33c5404c27 powerpc: Fix struct termio related ioctl macros https://gitlab.com/cki-project/kernel-ark/-/commit/99c8b56381c2f05815c77e6e41380b3d23559ea0 99c8b56381c2f05815c77e6e41380b3d23559ea0 mei: vsc: Fix fortify-panic caused by invalid counted_by() use diff --git a/kernel.changelog b/kernel.changelog index 583980bcc..1cc73f950 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Tue May 20 2025 Fedora Kernel Team [6.15.0-0.rc7.58] +- powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) +Resolves: + * Mon May 19 2025 Fedora Kernel Team [6.15.0-0.rc7.57] - redhat/configs: remove CRC16 config files (Scott Weaver) - Linux v6.15.0-0.rc7 diff --git a/kernel.spec b/kernel.spec index a44d7f4c9..f75599f72 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.rc7.57 +%define pkgrelease 0.rc7.58 %define kversion 6 %define tarfile_release 6.15-rc7 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.57%{?buildid}%{?dist} +%define specrelease 0.rc7.58%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4259,7 +4259,10 @@ fi\ # # %changelog -* Mon May 19 2025 Justin M. Forbes [6.15.0-0.rc7.57] +* Tue May 20 2025 Justin M. Forbes [6.15.0-0.rc7.58] +- Revert "loop: Add sanity check for read/write_iter" (Justin M. Forbes) + +* Tue May 20 2025 Fedora Kernel Team [6.15.0-0.rc7.58] - powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) * Mon May 19 2025 Fedora Kernel Team [6.15.0-0.rc7.57] diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index cd4bf289c..34035931b 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -22,6 +22,7 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + drivers/ata/libahci.c | 18 + + drivers/block/loop.c | 23 - drivers/char/ipmi/ipmi_dmi.c | 15 + drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/char/random.c | 126 ++++- @@ -76,7 +77,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 78 files changed, 2729 insertions(+), 212 deletions(-) + 79 files changed, 2729 insertions(+), 235 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 8f75ec177399..0c4bc4a2203d 100644 @@ -1050,6 +1051,54 @@ index 22afa4ff860d..78eacccaa1ae 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index b8ba7de08753..46cba261075f 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -505,17 +505,6 @@ static void loop_assign_backing_file(struct loop_device *lo, struct file *file) + lo->lo_min_dio_size = loop_query_min_dio_size(lo); + } + +-static int loop_check_backing_file(struct file *file) +-{ +- if (!file->f_op->read_iter) +- return -EINVAL; +- +- if ((file->f_mode & FMODE_WRITE) && !file->f_op->write_iter) +- return -EINVAL; +- +- return 0; +-} +- + /* + * loop_change_fd switched the backing store of a loopback device to + * a new file. This is useful for operating system installers to free up +@@ -537,10 +526,6 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + if (!file) + return -EBADF; + +- error = loop_check_backing_file(file); +- if (error) +- return error; +- + /* suppress uevents while reconfiguring the device */ + dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 1); + +@@ -978,14 +963,6 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, + + if (!file) + return -EBADF; +- +- if ((mode & BLK_OPEN_WRITE) && !file->f_op->write_iter) +- return -EINVAL; +- +- error = loop_check_backing_file(file); +- if (error) +- return error; +- + is_loop = is_loop_device(file); + + /* This is safe, since we have a reference from open(). */ diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c diff --git a/sources b/sources index 95550157a..1aac53f5a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.15-rc7.tar.xz) = 1e207baada53442a7224957a52090e74e8a52b35bc30544bc77e81fa25fbb8db3d5c26e1efc9c0c2604ea295458f337491a40946d0fd18840a46d4b3c7a1f597 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 84f89ec239dac99466293765f429010618639c09d9d2fb2cb9a329a823438c765e98b8e78821e95a824a7480428480a50ca58119667ff72666935895632152c8 -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = a3f97551e75d4db323c9abac98601374be7577e8a02e5d09244a1e58c73a3c16259dc69ebdd3f1b8e5e65f58b712e123864a7df4c26abcd1aed98b09605b7993 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = c89b34bdb8c08d2941416fe8d6a2032a2488b7a558a8119fa356dc8486887868b595ab3f20e9dc4ce9843ac501f72d287c314656630a5fb12bdfbfa2c7b639e6 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 7e687ff4cea0416cb74dcbb65a3042643d13f577f0085acdf51fe41beec247362668d7bd0af069bbc20059a0d1f3a2614e5789c25f2b0b22f3afbeeb323f0bab