From 746d29d9147fe7ae46a84ca9113c6cd1ac3c4ed5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 15 Apr 2025 09:22:00 -0600 Subject: [PATCH] kernel-6.15.0-0.rc2.20250415git834a4a689699.23 * Tue Apr 15 2025 Fedora Kernel Team [6.15.0-0.rc2.834a4a689699.23] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 +- kernel.changelog | 6 +- kernel.spec | 11 ++- patch-6.15-redhat.patch | 158 ++++++++++++++++++++-------------------- sources | 6 +- 6 files changed, 97 insertions(+), 90 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 578e043c8..bfb4dd0e4 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 = 22 +RHEL_RELEASE = 23 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 66d3d8b28..dc1e244cf 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/d36b8f65edbf5a6a89421bd2046dbcf40705866e - d36b8f65edbf5a6a89421bd2046dbcf40705866e apply -Wno-error=unterminated-string-initialization temporarily +https://gitlab.com/cki-project/kernel-ark/-/commit/801e7b9d31313840039b85b8463f8d732804d90d + 801e7b9d31313840039b85b8463f8d732804d90d apply -Wno-error=unterminated-string-initialization temporarily 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 3804311fb..17b6d2845 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,11 @@ -* Mon Apr 14 2025 Fedora Kernel Team [6.15.0-0.rc2.22] +* Tue Apr 15 2025 Fedora Kernel Team [6.15.0-0.rc2.834a4a689699.23] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: +* Tue Apr 15 2025 Fedora Kernel Team [6.15.0-0.rc2.834a4a689699.22] +- Linux v6.15.0-0.rc2.834a4a689699 +Resolves: + * Mon Apr 14 2025 Fedora Kernel Team [6.15.0-0.rc2.21] - Linux v6.15.0-0.rc2 Resolves: diff --git a/kernel.spec b/kernel.spec index 0d3894d39..e485f199e 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.rc2.22 +%define pkgrelease 0.rc2.20250415git834a4a689699.23 %define kversion 6 -%define tarfile_release 6.15-rc2 +%define tarfile_release 6.15-rc2-37-g834a4a689699 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.22%{?buildid}%{?dist} +%define specrelease 0.rc2.20250415git834a4a689699.23%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4186,9 +4186,12 @@ fi\ # # %changelog -* Mon Apr 14 2025 Fedora Kernel Team [6.15.0-0.rc2.22] +* Tue Apr 15 2025 Fedora Kernel Team [6.15.0-0.rc2.834a4a689699.23] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Tue Apr 15 2025 Fedora Kernel Team [6.15.0-0.rc2.834a4a689699.22] +- Linux v6.15.0-0.rc2.834a4a689699 + * Mon Apr 14 2025 Fedora Kernel Team [6.15.0-0.rc2.21] - Linux v6.15.0-0.rc2 diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index a780da03c..cd267a9de 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -80,7 +80,7 @@ 79 files changed, 2744 insertions(+), 219 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index d9fd26b95b340..aeafaa431ecda 100644 +index d9fd26b95b34..aeafaa431ecd 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6223,6 +6223,17 @@ @@ -119,7 +119,7 @@ index d9fd26b95b340..aeafaa431ecda 100644 useful for debugging certain unwinder error diff --git a/Documentation/admin-guide/rh-waived-features.rst b/Documentation/admin-guide/rh-waived-features.rst new file mode 100644 -index 0000000000000..45caec7fbae64 +index 000000000000..45caec7fbae6 --- /dev/null +++ b/Documentation/admin-guide/rh-waived-features.rst @@ -0,0 +1,21 @@ @@ -145,7 +145,7 @@ index 0000000000000..45caec7fbae64 +=============================== + diff --git a/Kconfig b/Kconfig -index 307e581144de3..11e93e479ce4f 100644 +index 307e581144de..11e93e479ce4 100644 --- a/Kconfig +++ b/Kconfig @@ -32,3 +32,5 @@ source "lib/Kconfig.debug" @@ -156,7 +156,7 @@ index 307e581144de3..11e93e479ce4f 100644 +source "Kconfig.redhat" diff --git a/Kconfig.redhat b/Kconfig.redhat new file mode 100644 -index 0000000000000..85771d74c34f9 +index 000000000000..85771d74c34f --- /dev/null +++ b/Kconfig.redhat @@ -0,0 +1,31 @@ @@ -192,7 +192,7 @@ index 0000000000000..85771d74c34f9 + +endmenu diff --git a/Makefile b/Makefile -index c91afd55099ea..42eb59f606df7 100644 +index c91afd55099e..42eb59f606df 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -272,7 +272,7 @@ index c91afd55099ea..42eb59f606df7 100644 @: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 25ed6f1a7c7ae..d19fc6d6c1347 100644 +index 25ed6f1a7c7a..d19fc6d6c134 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1232,9 +1232,9 @@ config HIGHMEM @@ -288,7 +288,7 @@ index 25ed6f1a7c7ae..d19fc6d6c1347 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index a182295e6f08b..a3cfce882d261 100644 +index a182295e6f08..a3cfce882d26 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1413,7 +1413,7 @@ endchoice @@ -301,7 +301,7 @@ index a182295e6f08b..a3cfce882d261 100644 For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b0d00032479d6..afb9544fb0074 100644 +index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h @@ -139,6 +139,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, @@ -313,7 +313,7 @@ index b0d00032479d6..afb9544fb0074 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 3b9d9ccfad63e..648ac8c7e1fd9 100644 +index 3b9d9ccfad63..648ac8c7e1fd 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2498,3 +2498,8 @@ int ipl_report_free(struct ipl_report *report) @@ -326,7 +326,7 @@ index 3b9d9ccfad63e..648ac8c7e1fd9 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index f244c5560e7f6..464f915011b8a 100644 +index f244c5560e7f..464f915011b8 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -348,7 +348,7 @@ index f244c5560e7f6..464f915011b8a 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 12126adbc3a9a..9bb1ebe65aa7e 100644 +index 12126adbc3a9..9bb1ebe65aa7 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1639,6 +1639,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -360,7 +360,7 @@ index 12126adbc3a9a..9bb1ebe65aa7e 100644 get_cpu_address_sizes(c); cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 9d2a13b37833c..6287becaadd79 100644 +index 9d2a13b37833..6287becaadd7 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -504,7 +504,7 @@ index 9d2a13b37833c..6287becaadd79 100644 } diff --git a/crypto/akcipher.c b/crypto/akcipher.c -index 72c82d9aa0778..da1ac5de8252d 100644 +index 72c82d9aa077..da1ac5de8252 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -141,8 +141,7 @@ int crypto_register_akcipher(struct akcipher_alg *alg) @@ -518,7 +518,7 @@ index 72c82d9aa0778..da1ac5de8252d 100644 alg->set_priv_key = akcipher_default_set_key; diff --git a/crypto/dh.c b/crypto/dh.c -index afc0fd8477613..e13258c3d1d1a 100644 +index afc0fd847761..e13258c3d1d1 100644 --- a/crypto/dh.c +++ b/crypto/dh.c @@ -227,10 +227,35 @@ static int dh_compute_value(struct kpp_request *req) @@ -558,7 +558,7 @@ index afc0fd8477613..e13258c3d1d1a 100644 } diff --git a/crypto/drbg.c b/crypto/drbg.c -index f28dfc2511a2b..7ddda2ab4d7bc 100644 +index f28dfc2511a2..7ddda2ab4d7b 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1495,13 +1495,14 @@ static int drbg_generate(struct drbg_state *drbg, @@ -613,7 +613,7 @@ index f28dfc2511a2b..7ddda2ab4d7bc 100644 /* diff --git a/crypto/rng.c b/crypto/rng.c -index 9d8804e464226..5dcf6fd52a77f 100644 +index 9d8804e46422..5dcf6fd52a77 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -12,10 +12,13 @@ @@ -838,7 +838,7 @@ index 9d8804e464226..5dcf6fd52a77f 100644 MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Random Number Generator"); diff --git a/crypto/seqiv.c b/crypto/seqiv.c -index 17e11d51ddc36..9c136a3b62679 100644 +index 17e11d51ddc3..9c136a3b6267 100644 --- a/crypto/seqiv.c +++ b/crypto/seqiv.c @@ -132,6 +132,19 @@ static int seqiv_aead_decrypt(struct aead_request *req) @@ -871,7 +871,7 @@ index 17e11d51ddc36..9c136a3b62679 100644 inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx); diff --git a/crypto/sig.c b/crypto/sig.c -index dfc7cae908028..2a58d726149db 100644 +index dfc7cae90802..2a58d726149d 100644 --- a/crypto/sig.c +++ b/crypto/sig.c @@ -106,8 +106,7 @@ static int sig_prepare_alg(struct sig_alg *alg) @@ -885,7 +885,7 @@ index dfc7cae908028..2a58d726149db 100644 alg->verify = sig_default_verify; if (!alg->set_priv_key) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index abd609d4c8efe..35e56cef44f14 100644 +index abd609d4c8ef..35e56cef44f1 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4053,7 +4053,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, @@ -922,7 +922,7 @@ index abd609d4c8efe..35e56cef44f14 100644 .kpp = __VECS(ecdh_p384_tv_template) } diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 20d757687e3d9..90a13f20f052b 100644 +index 20d757687e3d..90a13f20f052 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -142,6 +142,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) @@ -941,7 +941,7 @@ index 20d757687e3d9..90a13f20f052b 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index 1687483ff319e..390b67f19181a 100644 +index 1687483ff319..390b67f19181 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -984,7 +984,7 @@ index 1687483ff319e..390b67f19181a 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index fb1fe9f3b1a36..5a3312fc0ea01 100644 +index fb1fe9f3b1a3..5a3312fc0ea0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1794,6 +1794,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1004,7 +1004,7 @@ index fb1fe9f3b1a36..5a3312fc0ea01 100644 acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave, diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 22afa4ff860d1..78eacccaa1ae8 100644 +index 22afa4ff860d..78eacccaa1ae 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -730,6 +730,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -1033,7 +1033,7 @@ index 22afa4ff860d1..78eacccaa1ae8 100644 tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c -index bbf7029e224be..cf7faa970dd65 100644 +index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c +++ b/drivers/char/ipmi/ipmi_dmi.c @@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void) @@ -1059,7 +1059,7 @@ index bbf7029e224be..cf7faa970dd65 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index 3ba9d7e9a6c7c..82300dc5fd499 100644 +index 3ba9d7e9a6c7..82300dc5fd49 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -1094,7 +1094,7 @@ index 3ba9d7e9a6c7c..82300dc5fd499 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index 38f2fab29c569..d38f1d9b1fbc2 100644 +index 38f2fab29c56..d38f1d9b1fbc 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -51,9 +51,11 @@ @@ -1305,7 +1305,7 @@ index 38f2fab29c569..d38f1d9b1fbc2 100644 /******************************************************************** * diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile -index a2d0009560d0f..4f3486e6a84b2 100644 +index a2d0009560d0..4f3486e6a84b 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -1317,7 +1317,7 @@ index a2d0009560d0f..4f3486e6a84b2 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 7309394b8fc98..d9f7cbba5769d 100644 +index 7309394b8fc9..d9f7cbba5769 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -1463,7 +1463,7 @@ index 7309394b8fc98..d9f7cbba5769d 100644 diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 -index 0000000000000..de0a3714a5d44 +index 000000000000..de0a3714a5d4 --- /dev/null +++ b/drivers/firmware/efi/secureboot.c @@ -0,0 +1,38 @@ @@ -1506,7 +1506,7 @@ index 0000000000000..de0a3714a5d44 + } +} diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index d4af17fdba467..154f0403cbf4c 100644 +index d4af17fdba46..154f0403cbf4 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) @@ -1608,7 +1608,7 @@ index d4af17fdba467..154f0403cbf4c 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index 2b8f104638402..b2c08e0bf594f 100644 +index 2b8f10463840..b2c08e0bf594 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -11,6 +11,7 @@ @@ -1659,7 +1659,7 @@ index 2b8f104638402..b2c08e0bf594f 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index 2168b6cd71673..5d7cda175a0ce 100644 +index 2168b6cd7167..5d7cda175a0c 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -1851,7 +1851,7 @@ index 2168b6cd71673..5d7cda175a0ce 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 4f91a740c15fe..4ad2ac193ffdf 100644 +index 4f91a740c15f..4ad2ac193ffd 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1891,7 +1891,7 @@ index 4f91a740c15fe..4ad2ac193ffdf 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/media/i2c/ov08x40.c b/drivers/media/i2c/ov08x40.c -index cf0e41fc30719..54575eea3c490 100644 +index cf0e41fc3071..54575eea3c49 100644 --- a/drivers/media/i2c/ov08x40.c +++ b/drivers/media/i2c/ov08x40.c @@ -1341,7 +1341,7 @@ static int ov08x40_power_on(struct device *dev) @@ -1904,7 +1904,7 @@ index cf0e41fc30719..54575eea3c490 100644 return 0; diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c -index 185c08eab4ca1..215a68b1d863f 100644 +index 185c08eab4ca..215a68b1d863 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -5378,6 +5378,10 @@ static void mptsas_remove(struct pci_dev *pdev) @@ -1927,7 +1927,7 @@ index 185c08eab4ca1..215a68b1d863f 100644 }; MODULE_DEVICE_TABLE(pci, mptsas_pci_table); diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c -index a3901fbfac4f7..83add1994d2c2 100644 +index a3901fbfac4f..83add1994d2c 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -1240,12 +1240,17 @@ static struct spi_function_template mptspi_transport_functions = { @@ -1949,7 +1949,7 @@ index a3901fbfac4f7..83add1994d2c2 100644 }; MODULE_DEVICE_TABLE(pci, mptspi_pci_table); diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c -index 7be1649b19725..fa553d4914b6e 100644 +index 7be1649b1972..fa553d4914b6 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -36,20 +36,24 @@ @@ -2013,7 +2013,7 @@ index 7be1649b19725..fa553d4914b6e 100644 crc = ~crc32(~0, (u8 *)pkt, sizeof(pkt) + olen); diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c -index a00671b58701f..eeef2766b8b3d 100644 +index a00671b58701..eeef2766b8b3 100644 --- a/drivers/net/wireguard/main.c +++ b/drivers/net/wireguard/main.c @@ -12,6 +12,7 @@ @@ -2037,7 +2037,7 @@ index a00671b58701f..eeef2766b8b3d 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index c8bd71a739f72..909e20634daef 100644 +index c8bd71a739f7..909e20634dae 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ @@ -2065,7 +2065,7 @@ index c8bd71a739f72..909e20634daef 100644 return rc; if (rc < 0) { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 94daca15a096f..8de27d1098208 100644 +index 94daca15a096..8de27d109820 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4452,6 +4452,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -2100,7 +2100,7 @@ index 94daca15a096f..8de27d1098208 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c -index 4b12e6dd8f07f..d017f54e32943 100644 +index 4b12e6dd8f07..d017f54e3294 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -77,6 +77,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; @@ -2120,7 +2120,7 @@ index 4b12e6dd8f07f..d017f54e32943 100644 { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index c73a71ac3c290..9e7e41288a7a5 100644 +index c73a71ac3c29..9e7e41288a7a 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ @@ -2147,7 +2147,7 @@ index c73a71ac3c290..9e7e41288a7a5 100644 }; diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h -index 0b1616e93cf47..85fc52038a825 100644 +index 0b1616e93cf4..85fc52038a82 100644 --- a/drivers/scsi/lpfc/lpfc_ids.h +++ b/drivers/scsi/lpfc/lpfc_ids.h @@ -24,6 +24,7 @@ @@ -2221,7 +2221,7 @@ index 0b1616e93cf47..85fc52038a825 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index b44d134e7105b..bc6d03ada3ce5 100644 +index b44d134e7105..bc6d03ada3ce 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -8117,6 +8117,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { @@ -2252,7 +2252,7 @@ index b44d134e7105b..bc6d03ada3ce5 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) }, diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 950d8c9fb8843..be7b84fb780b0 100644 +index 950d8c9fb884..be7b84fb780b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = { @@ -2283,7 +2283,7 @@ index 950d8c9fb8843..be7b84fb780b0 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0e1dd6ef60a71..20ddc50a241c1 100644 +index 0e1dd6ef60a7..20ddc50a241c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5854,6 +5854,13 @@ static void hub_event(struct work_struct *work) @@ -2301,7 +2301,7 @@ index 0e1dd6ef60a71..20ddc50a241c1 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/fs/afs/main.c b/fs/afs/main.c -index c845c5daaeba0..00e14194265f8 100644 +index c845c5daaeba..00e14194265f 100644 --- a/fs/afs/main.c +++ b/fs/afs/main.c @@ -193,6 +193,9 @@ static int __init afs_init(void) @@ -2315,7 +2315,7 @@ index c845c5daaeba0..00e14194265f8 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index cadec6b1b5545..e35b381d9717f 100644 +index cadec6b1b554..e35b381d9717 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) @@ -2342,7 +2342,7 @@ index cadec6b1b5545..e35b381d9717f 100644 } diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 1819344996242..7b093e7c12f54 100644 +index 181934499624..7b093e7c12f5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5637,6 +5637,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) @@ -2364,7 +2364,7 @@ index 1819344996242..7b093e7c12f54 100644 err = ext4_register_sysfs(sb); if (err) diff --git a/include/linux/crypto.h b/include/linux/crypto.h -index 1e3809d28abd4..46ca14e581a03 100644 +index 1e3809d28abd..46ca14e581a0 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -138,6 +138,9 @@ @@ -2378,7 +2378,7 @@ index 1e3809d28abd4..46ca14e581a03 100644 /* * Miscellaneous stuff. diff --git a/include/linux/efi.h b/include/linux/efi.h -index 7d63d1d75f22f..c7481fdedbddb 100644 +index 7d63d1d75f22..c7481fdedbdd 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -2446,7 +2446,7 @@ index 7d63d1d75f22f..c7481fdedbddb 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index be2e8c0a187e4..114e213c89e23 100644 +index be2e8c0a187e..114e213c89e2 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -402,4 +402,20 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } @@ -2471,7 +2471,7 @@ index be2e8c0a187e4..114e213c89e23 100644 + #endif diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index bf3bbac4e02a5..b9840b1a43fed 100644 +index bf3bbac4e02a..b9840b1a43fe 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -444,6 +444,7 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -2483,7 +2483,7 @@ index bf3bbac4e02a5..b9840b1a43fed 100644 LSM_HOOK(int, 0, perf_event_open, int type) LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) diff --git a/include/linux/module.h b/include/linux/module.h -index d94b196d5a34e..ead452836a9f1 100644 +index d94b196d5a34..ead452836a9f 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -428,6 +428,7 @@ struct module { @@ -2504,7 +2504,7 @@ index d94b196d5a34e..ead452836a9f1 100644 + #endif /* _LINUX_MODULE_H */ diff --git a/include/linux/panic.h b/include/linux/panic.h -index 2494d51707ef4..b9d91c56c6ea9 100644 +index 2494d51707ef..b9d91c56c6ea 100644 --- a/include/linux/panic.h +++ b/include/linux/panic.h @@ -75,7 +75,22 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) @@ -2532,7 +2532,7 @@ index 2494d51707ef4..b9d91c56c6ea9 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index 0e8e3fd77e967..e4f2bb3a16e35 100644 +index 0e8e3fd77e96..e4f2bb3a16e3 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1630,6 +1630,7 @@ int pci_add_dynid(struct pci_driver *drv, @@ -2555,7 +2555,7 @@ index 0e8e3fd77e967..e4f2bb3a16e35 100644 void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); #endif diff --git a/include/linux/random.h b/include/linux/random.h -index 333cecfca93fd..6421bf2415a53 100644 +index 333cecfca93f..6421bf2415a5 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -9,6 +9,13 @@ @@ -2584,7 +2584,7 @@ index 333cecfca93fd..6421bf2415a53 100644 #endif diff --git a/include/linux/rh_flags.h b/include/linux/rh_flags.h new file mode 100644 -index 0000000000000..d498d319ace3a +index 000000000000..d498d319ace3 --- /dev/null +++ b/include/linux/rh_flags.h @@ -0,0 +1,34 @@ @@ -2624,7 +2624,7 @@ index 0000000000000..d498d319ace3a +#endif diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h new file mode 100644 -index 0000000000000..5139cb2cabdc0 +index 000000000000..5139cb2cabdc --- /dev/null +++ b/include/linux/rh_kabi.h @@ -0,0 +1,541 @@ @@ -3171,7 +3171,7 @@ index 0000000000000..5139cb2cabdc0 +#endif /* _LINUX_RH_KABI_H */ diff --git a/include/linux/rh_waived.h b/include/linux/rh_waived.h new file mode 100644 -index 0000000000000..945dd71cc0827 +index 000000000000..945dd71cc082 --- /dev/null +++ b/include/linux/rh_waived.h @@ -0,0 +1,19 @@ @@ -3195,7 +3195,7 @@ index 0000000000000..945dd71cc0827 + +#endif /* _RH_WAIVED_H */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index ab7eea01ab427..fff7c5f737fc8 100644 +index ab7eea01ab42..fff7c5f737fc 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -3207,7 +3207,7 @@ index ab7eea01ab427..fff7c5f737fc8 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index cc9b54d95d22c..fce0e3457cf75 100644 +index cc9b54d95d22..fce0e3457cf7 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2390,4 +2390,13 @@ static inline void security_initramfs_populated(void) @@ -3225,7 +3225,7 @@ index cc9b54d95d22c..fce0e3457cf75 100644 + #endif /* ! __LINUX_SECURITY_H */ diff --git a/init/main.c b/init/main.c -index 7f0a2a3dbd290..9b9398febe87a 100644 +index 7f0a2a3dbd29..9b9398febe87 100644 --- a/init/main.c +++ b/init/main.c @@ -1160,8 +1160,10 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn) @@ -3250,7 +3250,7 @@ index 7f0a2a3dbd290..9b9398febe87a 100644 if (!strcmp(fn_name, entry->buf)) { pr_debug("initcall %s blacklisted\n", fn_name); diff --git a/kernel/Makefile b/kernel/Makefile -index 434929de17ef2..25028f21e6842 100644 +index 434929de17ef..25028f21e684 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ @@ -3262,7 +3262,7 @@ index 434929de17ef2..25028f21e6842 100644 obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c -index ba6b6118cf504..76f8fd7c7ee1b 100644 +index ba6b6118cf50..76f8fd7c7ee1 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -571,7 +571,12 @@ void bpf_prog_kallsyms_del_all(struct bpf_prog *fp) @@ -3279,7 +3279,7 @@ index ba6b6118cf504..76f8fd7c7ee1b 100644 long bpf_jit_limit_max __read_mostly; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 9794446bc8c6c..48ad59d23531d 100644 +index 9794446bc8c6..48ad59d23531 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -3327,7 +3327,7 @@ index 9794446bc8c6c..48ad59d23531d 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index a2859dc3eea66..dda7d7026bbb7 100644 +index a2859dc3eea6..dda7d7026bbb 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -65,6 +65,8 @@ @@ -3379,7 +3379,7 @@ index a2859dc3eea66..dda7d7026bbb7 100644 #ifdef CONFIG_MODULE_DEBUGFS diff --git a/kernel/module/signing.c b/kernel/module/signing.c -index a2ff4242e623d..f0d2be1ee4f1c 100644 +index a2ff4242e623..f0d2be1ee4f1 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) @@ -3402,7 +3402,7 @@ index a2ff4242e623d..f0d2be1ee4f1c 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/kernel/panic.c b/kernel/panic.c -index a3889f38153d9..0e79932d65e59 100644 +index a3889f38153d..0e79932d65e5 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -512,6 +512,18 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { @@ -3426,7 +3426,7 @@ index a3889f38153d9..0e79932d65e59 100644 #undef TAINT_FLAG diff --git a/kernel/rh_flags.c b/kernel/rh_flags.c new file mode 100644 -index 0000000000000..10d26958f840c +index 000000000000..10d26958f840 --- /dev/null +++ b/kernel/rh_flags.c @@ -0,0 +1,115 @@ @@ -3547,7 +3547,7 @@ index 0000000000000..10d26958f840c +subsys_initcall(rh_flags_init); diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c new file mode 100644 -index 0000000000000..bb69e8965748b +index 000000000000..bb69e8965748 --- /dev/null +++ b/kernel/rh_messages.c @@ -0,0 +1,414 @@ @@ -3967,7 +3967,7 @@ index 0000000000000..bb69e8965748b +} diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h new file mode 100644 -index 0000000000000..647d7b9a4fe94 +index 000000000000..647d7b9a4fe9 --- /dev/null +++ b/kernel/rh_messages.h @@ -0,0 +1,326 @@ @@ -4299,7 +4299,7 @@ index 0000000000000..647d7b9a4fe94 +#endif /* __RH_MESSAGES_H */ diff --git a/kernel/rh_waived.c b/kernel/rh_waived.c new file mode 100644 -index 0000000000000..84e22b1730cc4 +index 000000000000..84e22b1730cc --- /dev/null +++ b/kernel/rh_waived.c @@ -0,0 +1,104 @@ @@ -4408,7 +4408,7 @@ index 0000000000000..84e22b1730cc4 +} +late_initcall(__add_rh_flag); diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn -index d75897559d184..08226fdd309d9 100644 +index d75897559d18..08226fdd309d 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -20,6 +20,10 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) @@ -4423,7 +4423,7 @@ index d75897559d184..08226fdd309d9 100644 KBUILD_CFLAGS += -Wframe-larger-than=$(CONFIG_FRAME_WARN) endif diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index be89921d60b61..63e2f2ec68f08 100644 +index be89921d60b6..63e2f2ec68f0 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -27,6 +27,7 @@ @@ -4456,7 +4456,7 @@ index be89921d60b61..63e2f2ec68f08 100644 ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name); if (ret >= sizeof(fname)) { diff --git a/scripts/tags.sh b/scripts/tags.sh -index 98680e9cd7be3..0880675cf5172 100755 +index 98680e9cd7be..0880675cf517 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi @@ -4469,7 +4469,7 @@ index 98680e9cd7be3..0880675cf5172 100755 # ignore arbitrary directories if [ -n "${IGNORE_DIRS}" ]; then diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index d1fdd113450a6..182e8090cfe85 100644 +index d1fdd113450a..182e8090cfe8 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, @@ -4493,7 +4493,7 @@ index d1fdd113450a6..182e8090cfe85 100644 } diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf4840101..d0501353a4b95 100644 +index e84ddf484010..d0501353a4b9 100644 --- a/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -4517,7 +4517,7 @@ index e84ddf4840101..d0501353a4b95 100644 prompt "Kernel default lockdown mode" default LOCK_DOWN_KERNEL_FORCE_NONE diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c -index cf83afa1d879a..aba751e7abffe 100644 +index cf83afa1d879..aba751e7abff 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -72,6 +72,17 @@ static int lockdown_is_locked_down(enum lockdown_reason what) diff --git a/sources b/sources index b352c7b69..844223435 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc2.tar.xz) = 1af3032f61a2baf506f53663959fb18bf4493b4871a21ce49835f7bb67ed8d08bb65ec23f4fd2591ee7bfa8b1ece78dcbc9d8f702f31f801edb3285b584cf077 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 55aac235cea0df2066688ce26a1be1dfb34b7fd6c340496b801ab6cad5238dfa9c532bdfde9e29f166d13fdce9b99267185f1ca848718a103b55dc1c2f673307 -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 7c951aa939eb35d3d5e395714aa98376e0f89c1a37c6bd0d9c50ec013ca96c09ea493312eb39111bbfe3fed3df232da919552da5f84551e8de7cc1b11ecd93ed +SHA512 (linux-6.15-rc2-37-g834a4a689699.tar.xz) = 2aeeaa42e2f49aa18c81626d5082b5e1771e6bea5320dc9cbc3971290110632fc0a03495db0b1adcd576ab2903c1197ebe759b3cf251047b55af20dfa46c68f7 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 22e6006264c0c5bd4459b54b9a7eb17df2110b47301069d6193dc810e874f538c7c05f58fd97191794bcf6bdb7f2c78e94b6f8092e37569ca9e9c0744dcc625d +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 78d9a61b03d0f04f5febc5ac922e62b199f7e7bf33f3bb0b65c820e9b9261d8ded022ad621414cbeb82f250ebc658186c0d27f588f2397db592a717050fdb019