|
|
|
@ -74,10 +74,10 @@
|
|
|
|
|
73 files changed, 2147 insertions(+), 207 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
|
|
|
|
index 70046a019d42..e672fd963195 100644
|
|
|
|
|
index 902ecd92a29fb..23bd65b59904d 100644
|
|
|
|
|
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
|
|
|
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
|
|
|
@@ -6892,6 +6892,15 @@
|
|
|
|
|
@@ -6890,6 +6890,15 @@
|
|
|
|
|
unknown_nmi_panic
|
|
|
|
|
[X86] Cause panic on unknown NMI.
|
|
|
|
|
|
|
|
|
@ -94,7 +94,7 @@ index 70046a019d42..e672fd963195 100644
|
|
|
|
|
Enable unwinder debug output. This can be
|
|
|
|
|
useful for debugging certain unwinder error
|
|
|
|
|
diff --git a/Kconfig b/Kconfig
|
|
|
|
|
index 745bc773f567..f57ff40109d7 100644
|
|
|
|
|
index 745bc773f5670..f57ff40109d71 100644
|
|
|
|
|
--- a/Kconfig
|
|
|
|
|
+++ b/Kconfig
|
|
|
|
|
@@ -30,3 +30,5 @@ source "lib/Kconfig"
|
|
|
|
@ -105,7 +105,7 @@ index 745bc773f567..f57ff40109d7 100644
|
|
|
|
|
+source "Kconfig.redhat"
|
|
|
|
|
diff --git a/Kconfig.redhat b/Kconfig.redhat
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 000000000000..7465c78a90e6
|
|
|
|
|
index 0000000000000..7465c78a90e6a
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/Kconfig.redhat
|
|
|
|
|
@@ -0,0 +1,26 @@
|
|
|
|
@ -136,7 +136,7 @@ index 000000000000..7465c78a90e6
|
|
|
|
|
+
|
|
|
|
|
+endmenu
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
|
|
|
index e1bf12891cb0..1a96ab05fc5d 100644
|
|
|
|
|
index 59d8a7f95d0a8..00a1191371413 100644
|
|
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
|
|
|
|
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
|
|
|
@ -174,7 +174,7 @@ index e1bf12891cb0..1a96ab05fc5d 100644
|
|
|
|
|
|
|
|
|
|
$(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0)
|
|
|
|
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
|
|
|
index b14aed3a17ab..5e4b473f78e6 100644
|
|
|
|
|
index b14aed3a17abb..5e4b473f78e6d 100644
|
|
|
|
|
--- a/arch/arm/Kconfig
|
|
|
|
|
+++ b/arch/arm/Kconfig
|
|
|
|
|
@@ -1223,9 +1223,9 @@ config HIGHMEM
|
|
|
|
@ -190,7 +190,7 @@ index b14aed3a17ab..5e4b473f78e6 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 7b11c98b3e84..20233a056d5f 100644
|
|
|
|
|
index 7b11c98b3e84b..20233a056d5fb 100644
|
|
|
|
|
--- a/arch/arm64/Kconfig
|
|
|
|
|
+++ b/arch/arm64/Kconfig
|
|
|
|
|
@@ -1323,7 +1323,7 @@ endchoice
|
|
|
|
@ -203,7 +203,7 @@ index 7b11c98b3e84..20233a056d5f 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 b0d00032479d..afb9544fb007 100644
|
|
|
|
|
index b0d00032479d6..afb9544fb0074 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,
|
|
|
|
@ -215,7 +215,7 @@ index b0d00032479d..afb9544fb007 100644
|
|
|
|
|
/*
|
|
|
|
|
* DIAG 308 support
|
|
|
|
|
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
|
|
|
|
|
index 1486350a4177..a240be567f22 100644
|
|
|
|
|
index 1486350a41775..a240be567f223 100644
|
|
|
|
|
--- a/arch/s390/kernel/ipl.c
|
|
|
|
|
+++ b/arch/s390/kernel/ipl.c
|
|
|
|
|
@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report)
|
|
|
|
@ -228,7 +228,7 @@ index 1486350a4177..a240be567f22 100644
|
|
|
|
|
+ return !!ipl_secure_flag;
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
|
|
|
|
|
index 24ed33f044ec..5dd65c88310d 100644
|
|
|
|
|
index 24ed33f044ec3..5dd65c88310db 100644
|
|
|
|
|
--- a/arch/s390/kernel/setup.c
|
|
|
|
|
+++ b/arch/s390/kernel/setup.c
|
|
|
|
|
@@ -49,6 +49,7 @@
|
|
|
|
@ -250,7 +250,7 @@ index 24ed33f044ec..5dd65c88310d 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 754d91857d63..6462ea617d57 100644
|
|
|
|
|
index 605c26c009c8a..9c3c1969f7d8e 100644
|
|
|
|
|
--- a/arch/x86/kernel/cpu/common.c
|
|
|
|
|
+++ b/arch/x86/kernel/cpu/common.c
|
|
|
|
|
@@ -1590,6 +1590,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
|
|
|
|
@ -262,7 +262,7 @@ index 754d91857d63..6462ea617d57 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 e125e059e2c4..88e7c5714629 100644
|
|
|
|
|
index e125e059e2c45..88e7c57146294 100644
|
|
|
|
|
--- a/arch/x86/kernel/setup.c
|
|
|
|
|
+++ b/arch/x86/kernel/setup.c
|
|
|
|
|
@@ -20,6 +20,7 @@
|
|
|
|
@ -406,7 +406,7 @@ index e125e059e2c4..88e7c5714629 100644
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/crypto/drbg.c b/crypto/drbg.c
|
|
|
|
|
index 3addce90930c..730b03de596a 100644
|
|
|
|
|
index 3addce90930c3..730b03de596a3 100644
|
|
|
|
|
--- a/crypto/drbg.c
|
|
|
|
|
+++ b/crypto/drbg.c
|
|
|
|
|
@@ -1494,13 +1494,14 @@ static int drbg_generate(struct drbg_state *drbg,
|
|
|
|
@ -461,7 +461,7 @@ index 3addce90930c..730b03de596a 100644
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
diff --git a/crypto/rng.c b/crypto/rng.c
|
|
|
|
|
index 279dffdebf59..d24dd37205cd 100644
|
|
|
|
|
index 279dffdebf598..d24dd37205cd7 100644
|
|
|
|
|
--- a/crypto/rng.c
|
|
|
|
|
+++ b/crypto/rng.c
|
|
|
|
|
@@ -12,10 +12,13 @@
|
|
|
|
@ -680,7 +680,7 @@ index 279dffdebf59..d24dd37205cd 100644
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
MODULE_DESCRIPTION("Random Number Generator");
|
|
|
|
|
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
|
|
|
|
|
index 20d757687e3d..90a13f20f052 100644
|
|
|
|
|
index 20d757687e3d9..90a13f20f052b 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)
|
|
|
|
@ -699,7 +699,7 @@ index 20d757687e3d..90a13f20f052 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 1687483ff319..390b67f19181 100644
|
|
|
|
|
index 1687483ff319e..390b67f19181a 100644
|
|
|
|
|
--- a/drivers/acpi/irq.c
|
|
|
|
|
+++ b/drivers/acpi/irq.c
|
|
|
|
|
@@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx {
|
|
|
|
@ -742,7 +742,7 @@ index 1687483ff319..390b67f19181 100644
|
|
|
|
|
return ctx.rc;
|
|
|
|
|
}
|
|
|
|
|
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
|
|
|
|
index d1464324de95..a3b2f99a2d78 100644
|
|
|
|
|
index d1464324de951..a3b2f99a2d785 100644
|
|
|
|
|
--- a/drivers/acpi/scan.c
|
|
|
|
|
+++ b/drivers/acpi/scan.c
|
|
|
|
|
@@ -1798,6 +1798,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
|
|
|
|
@ -762,7 +762,7 @@ index d1464324de95..a3b2f99a2d78 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 83431aae74d8..f2a9c0d644af 100644
|
|
|
|
|
index 83431aae74d8b..f2a9c0d644af2 100644
|
|
|
|
|
--- a/drivers/ata/libahci.c
|
|
|
|
|
+++ b/drivers/ata/libahci.c
|
|
|
|
|
@@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap)
|
|
|
|
@ -791,7 +791,7 @@ index 83431aae74d8..f2a9c0d644af 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 bbf7029e224b..cf7faa970dd6 100644
|
|
|
|
|
index bbf7029e224be..cf7faa970dd65 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)
|
|
|
|
@ -817,7 +817,7 @@ index bbf7029e224b..cf7faa970dd6 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 b0eedc4595b3..a9024c1dd68a 100644
|
|
|
|
|
index b0eedc4595b37..a9024c1dd68ab 100644
|
|
|
|
|
--- a/drivers/char/ipmi/ipmi_msghandler.c
|
|
|
|
|
+++ b/drivers/char/ipmi/ipmi_msghandler.c
|
|
|
|
|
@@ -35,6 +35,7 @@
|
|
|
|
@ -852,7 +852,7 @@ index b0eedc4595b3..a9024c1dd68a 100644
|
|
|
|
|
rv = ipmi_register_driver();
|
|
|
|
|
mutex_unlock(&ipmi_interfaces_mutex);
|
|
|
|
|
diff --git a/drivers/char/random.c b/drivers/char/random.c
|
|
|
|
|
index 456be28ba67c..be318d417622 100644
|
|
|
|
|
index 456be28ba67cb..be318d4176222 100644
|
|
|
|
|
--- a/drivers/char/random.c
|
|
|
|
|
+++ b/drivers/char/random.c
|
|
|
|
|
@@ -51,6 +51,7 @@
|
|
|
|
@ -1049,7 +1049,7 @@ index 456be28ba67c..be318d417622 100644
|
|
|
|
|
/********************************************************************
|
|
|
|
|
*
|
|
|
|
|
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
|
|
|
|
|
index a2d0009560d0..4f3486e6a84b 100644
|
|
|
|
|
index a2d0009560d0f..4f3486e6a84b2 100644
|
|
|
|
|
--- a/drivers/firmware/efi/Makefile
|
|
|
|
|
+++ b/drivers/firmware/efi/Makefile
|
|
|
|
|
@@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub
|
|
|
|
@ -1061,7 +1061,7 @@ index a2d0009560d0..4f3486e6a84b 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 fdf07dd6f459..cfd2b58a3494 100644
|
|
|
|
|
index fdf07dd6f4591..cfd2b58a34940 100644
|
|
|
|
|
--- a/drivers/firmware/efi/efi.c
|
|
|
|
|
+++ b/drivers/firmware/efi/efi.c
|
|
|
|
|
@@ -33,6 +33,7 @@
|
|
|
|
@ -1207,7 +1207,7 @@ index fdf07dd6f459..cfd2b58a3494 100644
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 000000000000..de0a3714a5d4
|
|
|
|
|
index 0000000000000..de0a3714a5d44
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/drivers/firmware/efi/secureboot.c
|
|
|
|
|
@@ -0,0 +1,38 @@
|
|
|
|
@ -1250,7 +1250,7 @@ index 000000000000..de0a3714a5d4
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
|
|
|
|
|
index d4af17fdba46..154f0403cbf4 100644
|
|
|
|
|
index d4af17fdba467..154f0403cbf4c 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)
|
|
|
|
@ -1352,7 +1352,7 @@ index d4af17fdba46..154f0403cbf4 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 c2ca4a02dfce..891f445c763e 100644
|
|
|
|
|
index c2ca4a02dfce1..891f445c763ef 100644
|
|
|
|
|
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
|
|
|
|
|
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
|
|
|
|
|
@@ -10,6 +10,7 @@
|
|
|
|
@ -1403,7 +1403,7 @@ index c2ca4a02dfce..891f445c763e 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 ef9ea295f9e0..0103334e8f32 100644
|
|
|
|
|
index ef9ea295f9e03..0103334e8f32c 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,
|
|
|
|
@ -1595,7 +1595,7 @@ index ef9ea295f9e0..0103334e8f32 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 a95a483def2d..e11ceb8b6df0 100644
|
|
|
|
|
index a95a483def2d2..e11ceb8b6df07 100644
|
|
|
|
|
--- a/drivers/iommu/iommu.c
|
|
|
|
|
+++ b/drivers/iommu/iommu.c
|
|
|
|
|
@@ -8,6 +8,7 @@
|
|
|
|
@ -1635,7 +1635,7 @@ index a95a483def2d..e11ceb8b6df0 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 300f8e955a53..9636f3391891 100644
|
|
|
|
|
index 300f8e955a531..9636f33918914 100644
|
|
|
|
|
--- a/drivers/message/fusion/mptsas.c
|
|
|
|
|
+++ b/drivers/message/fusion/mptsas.c
|
|
|
|
|
@@ -5383,6 +5383,10 @@ static void mptsas_remove(struct pci_dev *pdev)
|
|
|
|
@ -1658,7 +1658,7 @@ index 300f8e955a53..9636f3391891 100644
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
|
|
|
|
|
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
|
|
|
|
|
index 6c5920db1e9d..dfbc97b68e6a 100644
|
|
|
|
|
index 6c5920db1e9dc..dfbc97b68e6a5 100644
|
|
|
|
|
--- a/drivers/message/fusion/mptspi.c
|
|
|
|
|
+++ b/drivers/message/fusion/mptspi.c
|
|
|
|
|
@@ -1238,12 +1238,17 @@ static struct spi_function_template mptspi_transport_functions = {
|
|
|
|
@ -1688,7 +1688,7 @@ index 6c5920db1e9d..dfbc97b68e6a 100644
|
|
|
|
|
|
|
|
|
|
out_mptspi_probe:
|
|
|
|
|
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c
|
|
|
|
|
index ee4da9ab8013..d395d11eadc4 100644
|
|
|
|
|
index ee4da9ab8013c..d395d11eadc4b 100644
|
|
|
|
|
--- a/drivers/net/wireguard/main.c
|
|
|
|
|
+++ b/drivers/net/wireguard/main.c
|
|
|
|
|
@@ -12,6 +12,7 @@
|
|
|
|
@ -1712,7 +1712,7 @@ index ee4da9ab8013..d395d11eadc4 100644
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto err_allowedips;
|
|
|
|
|
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
|
|
|
|
index 27281a9a8951..62c23c3e8fc1 100644
|
|
|
|
|
index 27281a9a8951d..62c23c3e8fc1a 100644
|
|
|
|
|
--- a/drivers/nvme/host/core.c
|
|
|
|
|
+++ b/drivers/nvme/host/core.c
|
|
|
|
|
@@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
|
|
|
|
@ -1779,7 +1779,7 @@ index 27281a9a8951..62c23c3e8fc1 100644
|
|
|
|
|
#ifdef CONFIG_NVME_HOST_AUTH
|
|
|
|
|
queue_work(nvme_wq, &ctrl->dhchap_auth_work);
|
|
|
|
|
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
|
|
|
|
|
index 5397fb428b24..3df9c79197d0 100644
|
|
|
|
|
index 5397fb428b242..3df9c79197d03 100644
|
|
|
|
|
--- a/drivers/nvme/host/multipath.c
|
|
|
|
|
+++ b/drivers/nvme/host/multipath.c
|
|
|
|
|
@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
|
|
|
|
@ -1826,7 +1826,7 @@ index 5397fb428b24..3df9c79197d0 100644
|
|
|
|
|
|
|
|
|
|
if (!ctrl->max_namespaces ||
|
|
|
|
|
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
|
|
|
|
index d0ed64dc7380..e2a0044d1ccd 100644
|
|
|
|
|
index d0ed64dc7380e..e2a0044d1ccd4 100644
|
|
|
|
|
--- a/drivers/nvme/host/nvme.h
|
|
|
|
|
+++ b/drivers/nvme/host/nvme.h
|
|
|
|
|
@@ -920,6 +920,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
|
|
|
|
@ -1848,7 +1848,7 @@ index d0ed64dc7380..e2a0044d1ccd 100644
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
|
|
|
|
|
index af2996d0d17f..75d5971b9025 100644
|
|
|
|
|
index af2996d0d17ff..75d5971b90258 100644
|
|
|
|
|
--- a/drivers/pci/pci-driver.c
|
|
|
|
|
+++ b/drivers/pci/pci-driver.c
|
|
|
|
|
@@ -19,6 +19,7 @@
|
|
|
|
@ -1873,7 +1873,7 @@ index af2996d0d17f..75d5971b9025 100644
|
|
|
|
|
if (!rc)
|
|
|
|
|
return rc;
|
|
|
|
|
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|
|
|
|
index eff7f5df08e2..b58145ce7775 100644
|
|
|
|
|
index eff7f5df08e27..b58145ce7775c 100644
|
|
|
|
|
--- a/drivers/pci/quirks.c
|
|
|
|
|
+++ b/drivers/pci/quirks.c
|
|
|
|
|
@@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
|
|
|
|
@ -1908,7 +1908,7 @@ index eff7f5df08e2..b58145ce7775 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 68f4dbcfff49..90a6070a1332 100644
|
|
|
|
|
index 68f4dbcfff492..90a6070a13320 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;
|
|
|
|
@ -1928,7 +1928,7 @@ index 68f4dbcfff49..90a6070a1332 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/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
|
|
|
|
|
index 06acb5ff609e..a54ea7cf7d6e 100644
|
|
|
|
|
index 06acb5ff609ee..a54ea7cf7d6ea 100644
|
|
|
|
|
--- a/drivers/scsi/be2iscsi/be_main.c
|
|
|
|
|
+++ b/drivers/scsi/be2iscsi/be_main.c
|
|
|
|
|
@@ -387,11 +387,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
|
|
|
|
@ -1946,7 +1946,7 @@ index 06acb5ff609e..a54ea7cf7d6e 100644
|
|
|
|
|
{ 0 }
|
|
|
|
|
};
|
|
|
|
|
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
|
|
|
|
|
index af18d20f3079..0cebae77fd00 100644
|
|
|
|
|
index af18d20f30794..0cebae77fd00b 100644
|
|
|
|
|
--- a/drivers/scsi/hpsa.c
|
|
|
|
|
+++ b/drivers/scsi/hpsa.c
|
|
|
|
|
@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
|
|
|
|
@ -1973,7 +1973,7 @@ index af18d20f3079..0cebae77fd00 100644
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
|
|
|
|
|
index 0b1616e93cf4..85fc52038a82 100644
|
|
|
|
|
index 0b1616e93cf47..85fc52038a825 100644
|
|
|
|
|
--- a/drivers/scsi/lpfc/lpfc_ids.h
|
|
|
|
|
+++ b/drivers/scsi/lpfc/lpfc_ids.h
|
|
|
|
|
@@ -24,6 +24,7 @@
|
|
|
|
@ -2047,7 +2047,7 @@ index 0b1616e93cf4..85fc52038a82 100644
|
|
|
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
|
|
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
|
|
|
|
|
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
|
|
|
index 3d4f13da1ae8..7fdf37db9969 100644
|
|
|
|
|
index 3d4f13da1ae87..7fdf37db9969e 100644
|
|
|
|
|
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
|
|
|
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
|
|
|
@@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
|
|
|
|
@ -2079,7 +2079,7 @@ index 3d4f13da1ae8..7fdf37db9969 100644
|
|
|
|
|
/* Fusion */
|
|
|
|
|
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
|
|
|
|
|
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
|
|
index ef8ee93005ea..f6f0d7948867 100644
|
|
|
|
|
index ef8ee93005eae..f6f0d79488674 100644
|
|
|
|
|
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
|
|
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
|
|
@@ -12600,6 +12600,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev)
|
|
|
|
@ -2111,7 +2111,7 @@ index ef8ee93005ea..f6f0d7948867 100644
|
|
|
|
|
{ MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004,
|
|
|
|
|
PCI_ANY_ID, PCI_ANY_ID },
|
|
|
|
|
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
|
|
|
|
|
index 1e2f52210f60..5606b4994b91 100644
|
|
|
|
|
index 1e2f52210f605..5606b4994b916 100644
|
|
|
|
|
--- a/drivers/scsi/qla2xxx/qla_os.c
|
|
|
|
|
+++ b/drivers/scsi/qla2xxx/qla_os.c
|
|
|
|
|
@@ -8123,6 +8123,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
|
|
|
|
@ -2142,7 +2142,7 @@ index 1e2f52210f60..5606b4994b91 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/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
|
|
|
|
|
index 675332e49a7b..4a3cbddacef1 100644
|
|
|
|
|
index 675332e49a7b0..4a3cbddacef1f 100644
|
|
|
|
|
--- a/drivers/scsi/qla4xxx/ql4_os.c
|
|
|
|
|
+++ b/drivers/scsi/qla4xxx/ql4_os.c
|
|
|
|
|
@@ -9865,6 +9865,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
|
|
|
|
@ -2162,7 +2162,7 @@ index 675332e49a7b..4a3cbddacef1 100644
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
|
|
|
|
|
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
|
|
|
|
|
index 58fdf679341d..4a1f0b9eb0de 100644
|
|
|
|
|
index 58fdf679341dc..4a1f0b9eb0de4 100644
|
|
|
|
|
--- a/drivers/scsi/sd.c
|
|
|
|
|
+++ b/drivers/scsi/sd.c
|
|
|
|
|
@@ -119,6 +119,14 @@ static const char *sd_cache_types[] = {
|
|
|
|
@ -2190,7 +2190,7 @@ index 58fdf679341d..4a1f0b9eb0de 100644
|
|
|
|
|
if (err)
|
|
|
|
|
goto err_out_driver;
|
|
|
|
|
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
|
|
|
|
index 9446660e231b..1211cedb8009 100644
|
|
|
|
|
index 9446660e231bb..1211cedb80095 100644
|
|
|
|
|
--- a/drivers/usb/core/hub.c
|
|
|
|
|
+++ b/drivers/usb/core/hub.c
|
|
|
|
|
@@ -5844,6 +5844,13 @@ static void hub_event(struct work_struct *work)
|
|
|
|
@ -2208,7 +2208,7 @@ index 9446660e231b..1211cedb8009 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 a14f6013e316..6c20453fdf76 100644
|
|
|
|
|
index a14f6013e316d..6c20453fdf76b 100644
|
|
|
|
|
--- a/fs/afs/main.c
|
|
|
|
|
+++ b/fs/afs/main.c
|
|
|
|
|
@@ -199,6 +199,9 @@ static int __init afs_init(void)
|
|
|
|
@ -2222,7 +2222,7 @@ index a14f6013e316..6c20453fdf76 100644
|
|
|
|
|
|
|
|
|
|
error_proc:
|
|
|
|
|
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
|
|
|
|
|
index c0eb139adb07..19ded3068180 100644
|
|
|
|
|
index c0eb139adb07a..19ded30681800 100644
|
|
|
|
|
--- a/fs/erofs/super.c
|
|
|
|
|
+++ b/fs/erofs/super.c
|
|
|
|
|
@@ -583,6 +583,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
|
|
|
|
@ -2249,7 +2249,7 @@ index c0eb139adb07..19ded3068180 100644
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
|
|
|
|
|
index 044135796f2b..7806462b4af2 100644
|
|
|
|
|
index 044135796f2b6..7806462b4af27 100644
|
|
|
|
|
--- a/fs/ext4/super.c
|
|
|
|
|
+++ b/fs/ext4/super.c
|
|
|
|
|
@@ -5606,6 +5606,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
|
|
|
|
@ -2271,7 +2271,7 @@ index 044135796f2b..7806462b4af2 100644
|
|
|
|
|
|
|
|
|
|
failed_mount10:
|
|
|
|
|
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
|
|
|
|
|
index b164da5e129e..59021b8609a7 100644
|
|
|
|
|
index b164da5e129e8..59021b8609a70 100644
|
|
|
|
|
--- a/include/linux/crypto.h
|
|
|
|
|
+++ b/include/linux/crypto.h
|
|
|
|
|
@@ -133,6 +133,7 @@
|
|
|
|
@ -2283,7 +2283,7 @@ index b164da5e129e..59021b8609a7 100644
|
|
|
|
|
/*
|
|
|
|
|
* Miscellaneous stuff.
|
|
|
|
|
diff --git a/include/linux/efi.h b/include/linux/efi.h
|
|
|
|
|
index d59b0947fba0..8b1e2e71d485 100644
|
|
|
|
|
index d59b0947fba08..8b1e2e71d4858 100644
|
|
|
|
|
--- a/include/linux/efi.h
|
|
|
|
|
+++ b/include/linux/efi.h
|
|
|
|
|
@@ -45,6 +45,8 @@ struct screen_info;
|
|
|
|
@ -2351,7 +2351,7 @@ index d59b0947fba0..8b1e2e71d485 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 be2e8c0a187e..114e213c89e2 100644
|
|
|
|
|
index be2e8c0a187e4..114e213c89e23 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) { }
|
|
|
|
@ -2376,7 +2376,7 @@ index be2e8c0a187e..114e213c89e2 100644
|
|
|
|
|
+
|
|
|
|
|
#endif
|
|
|
|
|
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
|
|
|
|
|
index 334e00efbde4..5c962e31ffe5 100644
|
|
|
|
|
index 334e00efbde45..5c962e31ffe57 100644
|
|
|
|
|
--- a/include/linux/lsm_hook_defs.h
|
|
|
|
|
+++ b/include/linux/lsm_hook_defs.h
|
|
|
|
|
@@ -436,6 +436,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)
|
|
|
|
@ -2389,7 +2389,7 @@ index 334e00efbde4..5c962e31ffe5 100644
|
|
|
|
|
#ifdef CONFIG_PERF_EVENTS
|
|
|
|
|
LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
|
|
|
|
|
diff --git a/include/linux/module.h b/include/linux/module.h
|
|
|
|
|
index 1153b0d99a80..7e7b12225a92 100644
|
|
|
|
|
index 1153b0d99a808..7e7b12225a92e 100644
|
|
|
|
|
--- a/include/linux/module.h
|
|
|
|
|
+++ b/include/linux/module.h
|
|
|
|
|
@@ -418,6 +418,7 @@ struct module {
|
|
|
|
@ -2410,7 +2410,7 @@ index 1153b0d99a80..7e7b12225a92 100644
|
|
|
|
|
+
|
|
|
|
|
#endif /* _LINUX_MODULE_H */
|
|
|
|
|
diff --git a/include/linux/panic.h b/include/linux/panic.h
|
|
|
|
|
index 6717b15e798c..8e1d3eae1686 100644
|
|
|
|
|
index 6717b15e798c3..8e1d3eae16866 100644
|
|
|
|
|
--- a/include/linux/panic.h
|
|
|
|
|
+++ b/include/linux/panic.h
|
|
|
|
|
@@ -73,7 +73,23 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout)
|
|
|
|
@ -2439,7 +2439,7 @@ index 6717b15e798c..8e1d3eae1686 100644
|
|
|
|
|
|
|
|
|
|
struct taint_flag {
|
|
|
|
|
diff --git a/include/linux/pci.h b/include/linux/pci.h
|
|
|
|
|
index 16493426a04f..ef487d49985d 100644
|
|
|
|
|
index 16493426a04ff..ef487d49985d4 100644
|
|
|
|
|
--- a/include/linux/pci.h
|
|
|
|
|
+++ b/include/linux/pci.h
|
|
|
|
|
@@ -1621,6 +1621,7 @@ int pci_add_dynid(struct pci_driver *drv,
|
|
|
|
@ -2462,7 +2462,7 @@ index 16493426a04f..ef487d49985d 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 b0a940af4fff..8a52424fd0d5 100644
|
|
|
|
|
index b0a940af4fff5..8a52424fd0d50 100644
|
|
|
|
|
--- a/include/linux/random.h
|
|
|
|
|
+++ b/include/linux/random.h
|
|
|
|
|
@@ -9,6 +9,13 @@
|
|
|
|
@ -2491,7 +2491,7 @@ index b0a940af4fff..8a52424fd0d5 100644
|
|
|
|
|
#endif
|
|
|
|
|
diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 000000000000..5139cb2cabdc
|
|
|
|
|
index 0000000000000..5139cb2cabdc0
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/linux/rh_kabi.h
|
|
|
|
|
@@ -0,0 +1,541 @@
|
|
|
|
@ -3037,7 +3037,7 @@ index 000000000000..5139cb2cabdc
|
|
|
|
|
+
|
|
|
|
|
+#endif /* _LINUX_RH_KABI_H */
|
|
|
|
|
diff --git a/include/linux/rmi.h b/include/linux/rmi.h
|
|
|
|
|
index ab7eea01ab42..fff7c5f737fc 100644
|
|
|
|
|
index ab7eea01ab427..fff7c5f737fc8 100644
|
|
|
|
|
--- a/include/linux/rmi.h
|
|
|
|
|
+++ b/include/linux/rmi.h
|
|
|
|
|
@@ -364,6 +364,7 @@ struct rmi_driver_data {
|
|
|
|
@ -3049,7 +3049,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
|
|
|
|
|
|
|
|
|
|
int rmi_register_transport_device(struct rmi_transport_dev *xport);
|
|
|
|
|
diff --git a/include/linux/security.h b/include/linux/security.h
|
|
|
|
|
index 41a8f667bdfa..e2aebf520337 100644
|
|
|
|
|
index 41a8f667bdfa0..e2aebf520337e 100644
|
|
|
|
|
--- a/include/linux/security.h
|
|
|
|
|
+++ b/include/linux/security.h
|
|
|
|
|
@@ -507,6 +507,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
|
|
|
|
@ -3072,7 +3072,7 @@ index 41a8f667bdfa..e2aebf520337 100644
|
|
|
|
|
u32 *uctx_len, void *val, size_t val_len,
|
|
|
|
|
u64 id, u64 flags)
|
|
|
|
|
diff --git a/init/main.c b/init/main.c
|
|
|
|
|
index 881f6230ee59..ba8a684d3158 100644
|
|
|
|
|
index 881f6230ee59e..ba8a684d3158d 100644
|
|
|
|
|
--- a/init/main.c
|
|
|
|
|
+++ b/init/main.c
|
|
|
|
|
@@ -1158,6 +1158,9 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
|
|
|
|
@ -3086,7 +3086,7 @@ index 881f6230ee59..ba8a684d3158 100644
|
|
|
|
|
if (!strcmp(fn_name, entry->buf)) {
|
|
|
|
|
pr_debug("initcall %s blacklisted\n", fn_name);
|
|
|
|
|
diff --git a/kernel/Makefile b/kernel/Makefile
|
|
|
|
|
index 3c13240dfc9f..c5f42d2ce38b 100644
|
|
|
|
|
index 3c13240dfc9f0..c5f42d2ce38b2 100644
|
|
|
|
|
--- a/kernel/Makefile
|
|
|
|
|
+++ b/kernel/Makefile
|
|
|
|
|
@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \
|
|
|
|
@ -3098,7 +3098,7 @@ index 3c13240dfc9f..c5f42d2ce38b 100644
|
|
|
|
|
obj-$(CONFIG_MULTIUSER) += groups.o
|
|
|
|
|
obj-$(CONFIG_VHOST_TASK) += vhost_task.o
|
|
|
|
|
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
|
|
|
|
|
index c287925471f6..fed1012487f2 100644
|
|
|
|
|
index c287925471f68..fed1012487f27 100644
|
|
|
|
|
--- a/kernel/bpf/syscall.c
|
|
|
|
|
+++ b/kernel/bpf/syscall.c
|
|
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
@ -3146,7 +3146,7 @@ index c287925471f6..fed1012487f2 100644
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/kernel/module/main.c b/kernel/module/main.c
|
|
|
|
|
index e1e8a7a9d6c1..0bd15c7606e2 100644
|
|
|
|
|
index e1e8a7a9d6c19..0bd15c7606e2b 100644
|
|
|
|
|
--- a/kernel/module/main.c
|
|
|
|
|
+++ b/kernel/module/main.c
|
|
|
|
|
@@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = { \
|
|
|
|
@ -3178,7 +3178,7 @@ index e1e8a7a9d6c1..0bd15c7606e2 100644
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
diff --git a/kernel/module/signing.c b/kernel/module/signing.c
|
|
|
|
|
index a2ff4242e623..f0d2be1ee4f1 100644
|
|
|
|
|
index a2ff4242e623d..f0d2be1ee4f1c 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)
|
|
|
|
@ -3201,7 +3201,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644
|
|
|
|
|
|
|
|
|
|
int module_sig_check(struct load_info *info, int flags)
|
|
|
|
|
diff --git a/kernel/panic.c b/kernel/panic.c
|
|
|
|
|
index 747c3f3d289a..f848d7d13386 100644
|
|
|
|
|
index 747c3f3d289a2..f848d7d133860 100644
|
|
|
|
|
--- a/kernel/panic.c
|
|
|
|
|
+++ b/kernel/panic.c
|
|
|
|
|
@@ -495,6 +495,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
|
|
|
|
@ -3226,7 +3226,7 @@ index 747c3f3d289a..f848d7d13386 100644
|
|
|
|
|
/**
|
|
|
|
|
diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 000000000000..bb69e8965748
|
|
|
|
|
index 0000000000000..bb69e8965748b
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/kernel/rh_messages.c
|
|
|
|
|
@@ -0,0 +1,414 @@
|
|
|
|
@ -3646,7 +3646,7 @@ index 000000000000..bb69e8965748
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 000000000000..616692b1ac11
|
|
|
|
|
index 0000000000000..616692b1ac114
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/kernel/rh_messages.h
|
|
|
|
|
@@ -0,0 +1,109 @@
|
|
|
|
@ -3760,7 +3760,7 @@ index 000000000000..616692b1ac11
|
|
|
|
|
+
|
|
|
|
|
+#endif /* __RH_MESSAGES_H */
|
|
|
|
|
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
|
|
|
|
|
index 2f5b91da5afa..040cecc77778 100644
|
|
|
|
|
index 2f5b91da5afa9..040cecc777783 100644
|
|
|
|
|
--- a/scripts/mod/modpost.c
|
|
|
|
|
+++ b/scripts/mod/modpost.c
|
|
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
@ -3793,7 +3793,7 @@ index 2f5b91da5afa..040cecc77778 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 191e0461d6d5..e6f418b3e948 100755
|
|
|
|
|
index 191e0461d6d5b..e6f418b3e948b 100755
|
|
|
|
|
--- a/scripts/tags.sh
|
|
|
|
|
+++ b/scripts/tags.sh
|
|
|
|
|
@@ -16,6 +16,8 @@ fi
|
|
|
|
@ -3806,7 +3806,7 @@ index 191e0461d6d5..e6f418b3e948 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 d1fdd113450a..182e8090cfe8 100644
|
|
|
|
|
index d1fdd113450a6..182e8090cfe85 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,
|
|
|
|
@ -3830,7 +3830,7 @@ index d1fdd113450a..182e8090cfe8 100644
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig
|
|
|
|
|
index e84ddf484010..d0501353a4b9 100644
|
|
|
|
|
index e84ddf4840101..d0501353a4b95 100644
|
|
|
|
|
--- a/security/lockdown/Kconfig
|
|
|
|
|
+++ b/security/lockdown/Kconfig
|
|
|
|
|
@@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY
|
|
|
|
@ -3854,7 +3854,7 @@ index e84ddf484010..d0501353a4b9 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 cd84d8ea1dfb..e4c70a0312bc 100644
|
|
|
|
|
index cd84d8ea1dfbf..e4c70a0312bc8 100644
|
|
|
|
|
--- a/security/lockdown/lockdown.c
|
|
|
|
|
+++ b/security/lockdown/lockdown.c
|
|
|
|
|
@@ -74,6 +74,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what)
|
|
|
|
@ -3866,7 +3866,7 @@ index cd84d8ea1dfb..e4c70a0312bc 100644
|
|
|
|
|
|
|
|
|
|
const struct lsm_id lockdown_lsmid = {
|
|
|
|
|
diff --git a/security/security.c b/security/security.c
|
|
|
|
|
index 0a9a0ac3f266..a5cfc42f7c33 100644
|
|
|
|
|
index 0a9a0ac3f2662..a5cfc42f7c331 100644
|
|
|
|
|
--- a/security/security.c
|
|
|
|
|
+++ b/security/security.c
|
|
|
|
|
@@ -5567,6 +5567,18 @@ int security_locked_down(enum lockdown_reason what)
|
|
|
|
|