kernel-6.18.0-0.rc6.251120g23cb64fb7625.54

* Thu Nov 20 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.18.0-0.rc6.23cb64fb7625.54]
- powerpc/tools: drop `-o pipefail` in gcc check scripts (Jan Stancek)
- redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

patch-6.18-redhat.patch

@@ -42,7 +42,6 @@
  drivers/pci/pci-driver.c                           |   9 +
  drivers/pci/quirks.c                               |  24 +
  drivers/scsi/hpsa.c                                |   4 +
- drivers/scsi/lpfc/lpfc_ids.h                       |  12 +
  drivers/scsi/qla2xxx/qla_os.c                      |   6 +
  drivers/scsi/sd.c                                  |  13 +
  drivers/usb/core/hub.c                             |   7 +
@@ -71,7 +70,7 @@
  kernel/panic.c                                     |  12 +
  kernel/rh_flags.c                                  | 115 +++++
  kernel/rh_messages.c                               | 414 ++++++++++++++++
- kernel/rh_messages.h                               | 333 +++++++++++++
+ kernel/rh_messages.h                               | 335 +++++++++++++
  kernel/rh_waived.c                                 | 147 ++++++
  scripts/Makefile.lib                               |   3 +
  scripts/mod/modpost.c                              |   8 +
@@ -81,10 +80,10 @@
  security/lockdown/lockdown.c                       |  11 +
  tools/testing/selftests/bpf/Makefile               |   2 +-
  tools/testing/selftests/bpf/prog_tests/ksyms_btf.c |  31 --
- 83 files changed, 2823 insertions(+), 245 deletions(-)
+ 82 files changed, 2813 insertions(+), 245 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 6c42061ca20e5..88db6c8c0453c 100644
+index 6c42061ca20e..88db6c8c0453 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -6442,6 +6442,20 @@
@@ -126,7 +125,7 @@ index 6c42061ca20e5..88db6c8c0453c 100644
  			useful for debugging certain unwinder error
 diff --git a/Documentation/admin-guide/rh-waived-items.rst b/Documentation/admin-guide/rh-waived-items.rst
 new file mode 100644
-index 0000000000000..7471c891419c2
+index 000000000000..7471c891419c
 --- /dev/null
 +++ b/Documentation/admin-guide/rh-waived-items.rst
 @@ -0,0 +1,29 @@
@@ -160,7 +159,7 @@ index 0000000000000..7471c891419c2
 +============================
 +
 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"
@@ -171,7 +170,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 @@
@@ -207,7 +206,7 @@ index 0000000000000..85771d74c34f9
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index d763c2c75cdbf..dd11e7ece1307 100644
+index d763c2c75cdb..dd11e7ece130 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),)
@@ -277,7 +276,7 @@ index d763c2c75cdbf..dd11e7ece1307 100644
  	@:
  
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 4fb985b76e97f..ed23eedf6c2d6 100644
+index 4fb985b76e97..ed23eedf6c2d 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -1214,9 +1214,9 @@ config HIGHMEM
@@ -293,7 +292,7 @@ index 4fb985b76e97f..ed23eedf6c2d6 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 6663ffd23f252..b2e4aa83a6963 100644
+index 6663ffd23f25..b2e4aa83a696 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -1432,7 +1432,7 @@ endchoice
@@ -306,7 +305,7 @@ index 6663ffd23f252..b2e4aa83a6963 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/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
-index 23c05dc7a8f2a..d7b7b2f39e169 100644
+index 23c05dc7a8f2..d7b7b2f39e16 100644
 --- a/arch/arm64/kernel/setup.c
 +++ b/arch/arm64/kernel/setup.c
 @@ -32,6 +32,8 @@
@@ -358,7 +357,7 @@ index 23c05dc7a8f2a..d7b7b2f39e169 100644
  
  	arm64_memblock_init();
 diff --git a/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh b/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
-index 06706903503b6..baed467a016b3 100755
+index 06706903503b..baed467a016b 100755
 --- a/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
 +++ b/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
 @@ -2,7 +2,6 @@
@@ -370,7 +369,7 @@ index 06706903503b6..baed467a016b3 100755
  # To debug, uncomment the following line
  # set -x
 diff --git a/arch/powerpc/tools/gcc-check-mprofile-kernel.sh b/arch/powerpc/tools/gcc-check-mprofile-kernel.sh
-index 73e331e7660ef..6193b0ed0c775 100755
+index 73e331e7660e..6193b0ed0c77 100755
 --- a/arch/powerpc/tools/gcc-check-mprofile-kernel.sh
 +++ b/arch/powerpc/tools/gcc-check-mprofile-kernel.sh
 @@ -2,7 +2,6 @@
@@ -382,7 +381,7 @@ index 73e331e7660ef..6193b0ed0c775 100755
  # To debug, uncomment the following line
  # set -x
 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,
@@ -394,7 +393,7 @@ index b0d00032479d6..afb9544fb0074 100644
  /*
   * DIAG 308 support
 diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index 961a3d60a4ddd..927ba8a7b3ac0 100644
+index 961a3d60a4dd..927ba8a7b3ac 100644
 --- a/arch/s390/kernel/ipl.c
 +++ b/arch/s390/kernel/ipl.c
 @@ -2497,3 +2497,8 @@ int ipl_report_free(struct ipl_report *report)
@@ -407,7 +406,7 @@ index 961a3d60a4ddd..927ba8a7b3ac0 100644
 +	return !!ipl_secure_flag;
 +}
 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 892fce2b75497..eefbda45ac47a 100644
+index 892fce2b7549..eefbda45ac47 100644
 --- a/arch/s390/kernel/setup.c
 +++ b/arch/s390/kernel/setup.c
 @@ -49,6 +49,7 @@
@@ -429,7 +428,7 @@ index 892fce2b75497..eefbda45ac47a 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 02d97834a1d4d..4165e24261282 100644
+index 02d97834a1d4..4165e2426128 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
 @@ -1761,6 +1761,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
@@ -441,7 +440,7 @@ index 02d97834a1d4d..4165e24261282 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 1b2edd07a3e17..201705bc317a3 100644
+index 1b2edd07a3e1..201705bc317a 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -21,6 +21,7 @@
@@ -588,7 +587,7 @@ index 1b2edd07a3e17..201705bc317a3 100644
  }
  
 diff --git a/crypto/akcipher.c b/crypto/akcipher.c
-index a36f50c838278..f4f421e6cff20 100644
+index a36f50c83827..f4f421e6cff2 100644
 --- a/crypto/akcipher.c
 +++ b/crypto/akcipher.c
 @@ -142,8 +142,7 @@ int crypto_register_akcipher(struct akcipher_alg *alg)
@@ -602,7 +601,7 @@ index a36f50c838278..f4f421e6cff20 100644
  		alg->set_priv_key = akcipher_default_set_key;
  
 diff --git a/crypto/dh.c b/crypto/dh.c
-index 8250eeeebd0fe..01f0f3963a740 100644
+index 8250eeeebd0f..01f0f3963a74 100644
 --- a/crypto/dh.c
 +++ b/crypto/dh.c
 @@ -227,10 +227,35 @@ static int dh_compute_value(struct kpp_request *req)
@@ -642,7 +641,7 @@ index 8250eeeebd0fe..01f0f3963a740 100644
  	}
  
 diff --git a/crypto/drbg.c b/crypto/drbg.c
-index dbe4c8bb5ceb7..02d7b74a4bd0a 100644
+index dbe4c8bb5ceb..02d7b74a4bd0 100644
 --- a/crypto/drbg.c
 +++ b/crypto/drbg.c
 @@ -1495,13 +1495,14 @@ static int drbg_generate(struct drbg_state *drbg,
@@ -697,7 +696,7 @@ index dbe4c8bb5ceb7..02d7b74a4bd0a 100644
  
  /*
 diff --git a/crypto/rng.c b/crypto/rng.c
-index ee1768c5a4005..05ec1f0fca476 100644
+index ee1768c5a400..05ec1f0fca47 100644
 --- a/crypto/rng.c
 +++ b/crypto/rng.c
 @@ -12,10 +12,13 @@
@@ -922,7 +921,7 @@ index ee1768c5a4005..05ec1f0fca476 100644
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("Random Number Generator");
 diff --git a/crypto/seqiv.c b/crypto/seqiv.c
-index 2bae99e335268..a6dca30b28f23 100644
+index 2bae99e33526..a6dca30b28f2 100644
 --- a/crypto/seqiv.c
 +++ b/crypto/seqiv.c
 @@ -121,6 +121,19 @@ static int seqiv_aead_decrypt(struct aead_request *req)
@@ -955,7 +954,7 @@ index 2bae99e335268..a6dca30b28f23 100644
  
  	inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx);
 diff --git a/crypto/sig.c b/crypto/sig.c
-index beba745b64057..fd41f6d3abf9a 100644
+index beba745b6405..fd41f6d3abf9 100644
 --- a/crypto/sig.c
 +++ b/crypto/sig.c
 @@ -112,8 +112,7 @@ static int sig_prepare_alg(struct sig_alg *alg)
@@ -969,7 +968,7 @@ index beba745b64057..fd41f6d3abf9a 100644
  		alg->verify = sig_default_verify;
  	if (!alg->set_priv_key)
 diff --git a/crypto/testmgr.c b/crypto/testmgr.c
-index 6a490aaa71b9a..5c050f0975e54 100644
+index 6a490aaa71b9..5c050f0975e5 100644
 --- a/crypto/testmgr.c
 +++ b/crypto/testmgr.c
 @@ -3934,7 +3934,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
@@ -1006,7 +1005,7 @@ index 6a490aaa71b9a..5c050f0975e54 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)
@@ -1025,7 +1024,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 76a856c32c4d0..f2d25d95811c9 100644
+index 76a856c32c4d..f2d25d95811c 100644
 --- a/drivers/acpi/irq.c
 +++ b/drivers/acpi/irq.c
 @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx {
@@ -1068,7 +1067,7 @@ index 76a856c32c4d0..f2d25d95811c9 100644
  	return ctx.rc;
  }
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index ef16d58b29499..a3119cc4a9a9f 100644
+index ef16d58b2949..a3119cc4a9a9 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
 @@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
@@ -1088,7 +1087,7 @@ index ef16d58b29499..a3119cc4a9a9f 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 c79abdfcd7a9b..e23bfb7f94c72 100644
+index c79abdfcd7a9..e23bfb7f94c7 100644
 --- a/drivers/ata/libahci.c
 +++ b/drivers/ata/libahci.c
 @@ -731,6 +731,24 @@ int ahci_stop_engine(struct ata_port *ap)
@@ -1117,7 +1116,7 @@ index c79abdfcd7a9b..e23bfb7f94c72 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)
@@ -1143,7 +1142,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 3700ab4eba3e7..68f2c97866544 100644
+index 3700ab4eba3e..68f2c9786654 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -34,6 +34,7 @@
@@ -1178,7 +1177,7 @@ index 3700ab4eba3e7..68f2c97866544 100644
  	rv = ipmi_register_driver();
  	mutex_unlock(&ipmi_interfaces_mutex);
 diff --git a/drivers/char/random.c b/drivers/char/random.c
-index b8b24b6ed3fe4..a38d31cb520d9 100644
+index b8b24b6ed3fe..a38d31cb520d 100644
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
 @@ -51,9 +51,11 @@
@@ -1389,7 +1388,7 @@ index b8b24b6ed3fe4..a38d31cb520d9 100644
  /********************************************************************
   *
 diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
-index 8efbcf699e4ff..96d5a1ca981df 100644
+index 8efbcf699e4f..96d5a1ca981d 100644
 --- a/drivers/firmware/efi/Makefile
 +++ b/drivers/firmware/efi/Makefile
 @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB)		+= libstub
@@ -1401,7 +1400,7 @@ index 8efbcf699e4ff..96d5a1ca981df 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 1ce428e2ac8a0..12a79ddc25432 100644
+index 1ce428e2ac8a..12a79ddc2543 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
 @@ -33,6 +33,7 @@
@@ -1546,7 +1545,7 @@ index 1ce428e2ac8a0..12a79ddc25432 100644
  EXPORT_SYMBOL_GPL(efi_status_to_err);
  
 diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
-index 6a337f1f8787b..89244e0d9fa86 100644
+index 6a337f1f8787..89244e0d9fa8 100644
 --- a/drivers/firmware/efi/libstub/fdt.c
 +++ b/drivers/firmware/efi/libstub/fdt.c
 @@ -132,6 +132,11 @@ static efi_status_t update_fdt(void *orig_fdt, unsigned long orig_fdt_size,
@@ -1562,7 +1561,7 @@ index 6a337f1f8787b..89244e0d9fa86 100644
  	fdt_pack(fdt);
  
 diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c
-index 516f4f0069bd2..380354755108b 100644
+index 516f4f0069bd..380354755108 100644
 --- a/drivers/firmware/efi/libstub/secureboot.c
 +++ b/drivers/firmware/efi/libstub/secureboot.c
 @@ -29,10 +29,13 @@ enum efi_secureboot_mode efi_get_secureboot(void)
@@ -1599,7 +1598,7 @@ index 516f4f0069bd2..380354755108b 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 @@
@@ -1642,7 +1641,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)
@@ -1744,7 +1743,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 020f070bf17dc..c4bfe2c080cfb 100644
+index 020f070bf17d..c4bfe2c080cf 100644
 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
 +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
 @@ -12,6 +12,7 @@
@@ -1795,7 +1794,7 @@ index 020f070bf17dc..c4bfe2c080cfb 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 ccd9338a44dbe..5c54e522e8a47 100644
+index ccd9338a44db..5c54e522e8a4 100644
 --- a/drivers/input/rmi4/rmi_driver.c
 +++ b/drivers/input/rmi4/rmi_driver.c
 @@ -183,34 +183,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status,
@@ -1987,7 +1986,7 @@ index ccd9338a44dbe..5c54e522e8a47 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 59244c744eabd..183f4eaab6e20 100644
+index 59244c744eab..183f4eaab6e2 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
 @@ -8,6 +8,7 @@
@@ -2027,7 +2026,7 @@ index 59244c744eabd..183f4eaab6e20 100644
   * iommu_setup_default_domain - Set the default_domain for the group
   * @group: Group to change
 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)
@@ -2050,7 +2049,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 = {
@@ -2072,7 +2071,7 @@ index a3901fbfac4f7..83add1994d2c2 100644
  };
  MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
 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 @@
@@ -2096,7 +2095,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 302d61783f6c0..ff731f0b3e2ca 100644
+index 302d61783f6c..ff731f0b3e2c 100644
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
 @@ -19,6 +19,7 @@
@@ -2124,7 +2123,7 @@ index 302d61783f6c0..ff731f0b3e2ca 100644
  		return rc;
  	if (rc < 0) {
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index b9c252aa6fe08..166a5815e1efb 100644
+index b9c252aa6fe0..166a5815e1ef 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -4453,6 +4453,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
@@ -2159,7 +2158,7 @@ index b9c252aa6fe08..166a5815e1efb 100644
   * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
   * class code.  Fix it.
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 3654b12c5d5a7..9bc907e146a5d 100644
+index 3654b12c5d5a..9bc907e146a5 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
 @@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
@@ -2185,82 +2184,8 @@ index 3654b12c5d5a7..9bc907e146a5d 100644
  	{0,}
  };
  
-diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
-index 0b1616e93cf47..85fc52038a825 100644
---- a/drivers/scsi/lpfc/lpfc_ids.h
-+++ b/drivers/scsi/lpfc/lpfc_ids.h
-@@ -24,6 +24,7 @@
- #include <linux/pci.h>
- 
- const struct pci_device_id lpfc_id_table[] = {
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
-@@ -54,10 +55,13 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
-@@ -68,6 +72,7 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
-@@ -78,6 +83,7 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
-@@ -90,6 +96,7 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
-@@ -100,18 +107,23 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
- 		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 5ffd945866527..fb913ed9f0d1a 100644
+index 5ffd94586652..fb913ed9f0d1 100644
 --- a/drivers/scsi/qla2xxx/qla_os.c
 +++ b/drivers/scsi/qla2xxx/qla_os.c
 @@ -8100,6 +8100,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
@@ -2291,7 +2216,7 @@ index 5ffd945866527..fb913ed9f0d1a 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 0252d3f6bed17..ec711e8a38b8a 100644
+index 0252d3f6bed1..ec711e8a38b8 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
 @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = {
@@ -2322,7 +2247,7 @@ index 0252d3f6bed17..ec711e8a38b8a 100644
  	if (err)
  		goto err_out_driver;
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 256fe8c86828d..2e4a09948df8f 100644
+index 256fe8c86828..2e4a09948df8 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -5893,6 +5893,13 @@ static void hub_event(struct work_struct *work)
@@ -2340,7 +2265,7 @@ index 256fe8c86828d..2e4a09948df8f 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 e6bb8237db989..68fcbaf74e601 100644
+index e6bb8237db98..68fcbaf74e60 100644
 --- a/fs/afs/main.c
 +++ b/fs/afs/main.c
 @@ -194,6 +194,9 @@ static int __init afs_init(void)
@@ -2354,7 +2279,7 @@ index e6bb8237db989..68fcbaf74e601 100644
  
  error_proc:
 diff --git a/fs/erofs/super.c b/fs/erofs/super.c
-index f3f8d8c066e4e..ab1e9251ede5a 100644
+index f3f8d8c066e4..ab1e9251ede5 100644
 --- a/fs/erofs/super.c
 +++ b/fs/erofs/super.c
 @@ -630,6 +630,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
@@ -2381,7 +2306,7 @@ index f3f8d8c066e4e..ab1e9251ede5a 100644
  }
  
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 33e7c08c9529c..1cf7f4750f70c 100644
+index 33e7c08c9529..1cf7f4750f70 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
 @@ -5647,6 +5647,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
@@ -2403,7 +2328,7 @@ index 33e7c08c9529c..1cf7f4750f70c 100644
  	err = ext4_register_sysfs(sb);
  	if (err)
 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
-index a2137e19be7d8..df268ca70170e 100644
+index a2137e19be7d..df268ca70170 100644
 --- a/include/linux/crypto.h
 +++ b/include/linux/crypto.h
 @@ -151,6 +151,9 @@
@@ -2417,7 +2342,7 @@ index a2137e19be7d8..df268ca70170e 100644
  /*
   * Miscellaneous stuff.
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index a98cc39e7aaa8..00f31eefd0c5a 100644
+index a98cc39e7aaa..00f31eefd0c5 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -45,6 +45,8 @@ struct screen_info;
@@ -2485,7 +2410,7 @@ index a98cc39e7aaa8..00f31eefd0c5a 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 5b46924fdff52..ffd5e38d3cb78 100644
+index 5b46924fdff5..ffd5e38d3cb7 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
 @@ -403,4 +403,20 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
@@ -2510,7 +2435,7 @@ index 5b46924fdff52..ffd5e38d3cb78 100644
 +
  #endif
 diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index 8c42b4bde09c0..694ce5c5bcd43 100644
+index 8c42b4bde09c..694ce5c5bcd4 100644
 --- a/include/linux/lsm_hook_defs.h
 +++ b/include/linux/lsm_hook_defs.h
 @@ -446,6 +446,7 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)
@@ -2522,7 +2447,7 @@ index 8c42b4bde09c0..694ce5c5bcd43 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 e135cc79aceea..51621863f4590 100644
+index e135cc79acee..51621863f459 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
 @@ -418,6 +418,7 @@ struct module {
@@ -2545,7 +2470,7 @@ index e135cc79aceea..51621863f4590 100644
  DEFINE_FREE(module_put, struct module *, if (_T) module_put(_T))
  
 diff --git a/include/linux/panic.h b/include/linux/panic.h
-index 6f972a66c13ee..d484940c73bd0 100644
+index 6f972a66c13e..d484940c73bd 100644
 --- a/include/linux/panic.h
 +++ b/include/linux/panic.h
 @@ -80,7 +80,22 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout)
@@ -2573,7 +2498,7 @@ index 6f972a66c13ee..d484940c73bd0 100644
  
  struct taint_flag {
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index bf97d49c23cf5..e451ed55fd96a 100644
+index bf97d49c23cf..e451ed55fd96 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -1651,6 +1651,7 @@ int pci_add_dynid(struct pci_driver *drv,
@@ -2596,7 +2521,7 @@ index bf97d49c23cf5..e451ed55fd96a 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 @@
@@ -2625,7 +2550,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 @@
@@ -2665,7 +2590,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 @@
@@ -3212,7 +3137,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..d62a9e896b5ee
+index 000000000000..d62a9e896b5e
 --- /dev/null
 +++ b/include/linux/rh_waived.h
 @@ -0,0 +1,19 @@
@@ -3236,7 +3161,7 @@ index 0000000000000..d62a9e896b5ee
 +
 +#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 {
@@ -3248,7 +3173,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 92ac3f27b9733..d9efb9b50aed9 100644
+index 92ac3f27b973..d9efb9b50aed 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
 @@ -2407,4 +2407,13 @@ static inline void security_initramfs_populated(void)
@@ -3266,7 +3191,7 @@ index 92ac3f27b9733..d9efb9b50aed9 100644
 +
  #endif /* ! __LINUX_SECURITY_H */
 diff --git a/init/main.c b/init/main.c
-index 07a3116811c5d..ea319de7dff9c 100644
+index 07a3116811c5..ea319de7dff9 100644
 --- a/init/main.c
 +++ b/init/main.c
 @@ -1172,8 +1172,10 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
@@ -3291,7 +3216,7 @@ index 07a3116811c5d..ea319de7dff9c 100644
  		if (!strcmp(fn_name, entry->buf)) {
  			pr_debug("initcall %s blacklisted\n", fn_name);
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 9fe722305c9be..7c2f153f0e08e 100644
+index 9fe722305c9b..7c2f153f0e08 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -12,6 +12,8 @@ obj-y     = fork.o exec_domain.o panic.o \
@@ -3304,7 +3229,7 @@ index 9fe722305c9be..7c2f153f0e08e 100644
  obj-$(CONFIG_VHOST_TASK) += vhost_task.o
  
 diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
-index d595fe512498c..362eb90a9bbe5 100644
+index d595fe512498..362eb90a9bbe 100644
 --- a/kernel/bpf/core.c
 +++ b/kernel/bpf/core.c
 @@ -543,7 +543,12 @@ void bpf_prog_kallsyms_del_all(struct bpf_prog *fp)
@@ -3321,7 +3246,7 @@ index d595fe512498c..362eb90a9bbe5 100644
  long bpf_jit_limit_max __read_mostly;
  
 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 8a129746bd6cc..cf8d472fa999a 100644
+index 8a129746bd6c..cf8d472fa999 100644
 --- a/kernel/bpf/syscall.c
 +++ b/kernel/bpf/syscall.c
 @@ -27,6 +27,7 @@
@@ -3369,7 +3294,7 @@ index 8a129746bd6cc..cf8d472fa999a 100644
  	}
  
 diff --git a/kernel/module/main.c b/kernel/module/main.c
-index c66b261849362..0eb08102db5bc 100644
+index c66b26184936..0eb08102db5b 100644
 --- a/kernel/module/main.c
 +++ b/kernel/module/main.c
 @@ -65,6 +65,8 @@
@@ -3421,7 +3346,7 @@ index c66b261849362..0eb08102db5bc 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)
@@ -3444,7 +3369,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 24cc3eec1805f..57b4bbc3231f1 100644
+index 24cc3eec1805..57b4bbc3231f 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
 @@ -660,6 +660,18 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
@@ -3468,7 +3393,7 @@ index 24cc3eec1805f..57b4bbc3231f1 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 @@
@@ -3589,7 +3514,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 @@
@@ -4009,10 +3934,10 @@ index 0000000000000..bb69e8965748b
 +}
 diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
 new file mode 100644
-index 0000000000000..a4fbf54d2b84a
+index 000000000000..05ad12af6a6d
 --- /dev/null
 +++ b/kernel/rh_messages.h
-@@ -0,0 +1,333 @@
+@@ -0,0 +1,335 @@
 +/*
 + * WARNING: This file is auto-generated by an internal Red Hat script and,
 + * in general, should not be modified by hand.
@@ -4255,6 +4180,8 @@ index 0000000000000..a4fbf54d2b84a
 +	{ 0x10df, 0xfe12, PCI_ANY_ID, PCI_ANY_ID },
 +	{ 0x19a2, 0x0704, PCI_ANY_ID, PCI_ANY_ID },
 +	{ 0x19a2, 0x0714, PCI_ANY_ID, PCI_ANY_ID },
++	{ 0x10df, 0xe208, PCI_ANY_ID, PCI_ANY_ID },
++	{ 0x10df, 0xe268, PCI_ANY_ID, PCI_ANY_ID },
 +	{ 0x1000, 0x0060, PCI_ANY_ID, PCI_ANY_ID },
 +	{ 0x1000, 0x0078, PCI_ANY_ID, PCI_ANY_ID },
 +	{ 0x1000, 0x007C, PCI_ANY_ID, PCI_ANY_ID },
@@ -4348,7 +4275,7 @@ index 0000000000000..a4fbf54d2b84a
 +#endif /* __RH_MESSAGES_H */
 diff --git a/kernel/rh_waived.c b/kernel/rh_waived.c
 new file mode 100644
-index 0000000000000..20966f7c7277f
+index 000000000000..20966f7c7277
 --- /dev/null
 +++ b/kernel/rh_waived.c
 @@ -0,0 +1,147 @@
@@ -4500,7 +4427,7 @@ index 0000000000000..20966f7c7277f
 +}
 +late_initcall(__add_rh_flag);
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 1d581ba5df66f..7826803444df9 100644
+index 1d581ba5df66..7826803444df 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
 @@ -191,7 +191,10 @@ objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE)		+= --static-call
@@ -4515,7 +4442,7 @@ index 1d581ba5df66f..7826803444df9 100644
  objtool-args = $(objtool-args-y)					\
  	$(if $(delay-objtool), --link)					\
 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 47c8aa2a69392..de98c5afa921e 100644
+index 47c8aa2a6939..de98c5afa921 100644
 --- a/scripts/mod/modpost.c
 +++ b/scripts/mod/modpost.c
 @@ -27,6 +27,7 @@
@@ -4548,7 +4475,7 @@ index 47c8aa2a69392..de98c5afa921e 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 99ce427d9a69d..f191cd9d7ee6e 100755
+index 99ce427d9a69..f191cd9d7ee6 100755
 --- a/scripts/tags.sh
 +++ b/scripts/tags.sh
 @@ -16,6 +16,8 @@ fi
@@ -4561,7 +4488,7 @@ index 99ce427d9a69d..f191cd9d7ee6e 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,
@@ -4585,7 +4512,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
@@ -4609,7 +4536,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)
@@ -4631,7 +4558,7 @@ index cf83afa1d879a..aba751e7abffe 100644
  	LSM_HOOK_INIT(locked_down, lockdown_is_locked_down),
  };
 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
-index f00587d4ede68..fa62443daadeb 100644
+index f00587d4ede6..fa62443daade 100644
 --- a/tools/testing/selftests/bpf/Makefile
 +++ b/tools/testing/selftests/bpf/Makefile
 @@ -503,7 +503,7 @@ LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c 	\
@@ -4644,7 +4571,7 @@ index f00587d4ede68..fa62443daadeb 100644
  SKEL_BLACKLIST += $$(LSKELS) $$(LSKELS_SIGNED)
  
 diff --git a/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c b/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c
-index 1d7a2f1e07317..b22f3a9cb8b80 100644
+index 1d7a2f1e0731..b22f3a9cb8b8 100644
 --- a/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c
 +++ b/tools/testing/selftests/bpf/prog_tests/ksyms_btf.c
 @@ -7,7 +7,6 @@