diff options
Diffstat (limited to 'patch-5.18-redhat.patch')
| -rw-r--r-- | patch-5.18-redhat.patch | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 6a6415849..16b9230d4 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -130,7 +130,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 7214f075e1f0..6ecb3acb605c 100644 +index c28c5d91e5c8..509e4e0c7780 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -144,7 +144,7 @@ index 7214f075e1f0..6ecb3acb605c 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1235,7 +1239,13 @@ define filechk_version.h +@@ -1234,7 +1238,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -176,7 +176,7 @@ index c1251856ef77..fefe78477b23 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 f8680892401b..5f7087d2d907 100644 +index 23048be0333b..13dbf88d88e3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1117,7 +1117,7 @@ endchoice @@ -225,7 +225,7 @@ index 3f8ee257f9aa..3ab92feb6241 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 5ad1dde23dc5..b6192d58eed3 100644 +index 28ae7df26c4a..8f5ea21872ff 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2216,3 +2216,8 @@ int ipl_report_free(struct ipl_report *report) @@ -238,7 +238,7 @@ index 5ad1dde23dc5..b6192d58eed3 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 05327be3a982..c473e5ca67f1 100644 +index 84e23fcc1106..a6ec5247aa18 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -249,7 +249,7 @@ index 05327be3a982..c473e5ca67f1 100644 #include <linux/hugetlb.h> #include <linux/kmemleak.h> -@@ -965,6 +966,9 @@ void __init setup_arch(char **cmdline_p) +@@ -964,6 +965,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -260,10 +260,10 @@ index 05327be3a982..c473e5ca67f1 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 64deb7727d00..1aacdc64cd63 100644 +index ed4417500700..50045296524c 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1393,6 +1393,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1447,6 +1447,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) cpu_detect(c); get_cpu_vendor(c); get_cpu_cap(c); @@ -547,10 +547,10 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index c116e3a65ab4..3a3837cebc3a 100644 +index 9efbfe087de7..90f4595c8b3a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1774,6 +1774,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1779,6 +1779,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; @@ -1524,10 +1524,10 @@ index ee4da9ab8013..0f217997a764 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index cd6eac8e3dd6..4dbf41e1da50 100644 +index 677fa4bf76d3..71d5d773d3d8 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) +@@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1537,7 +1537,7 @@ index cd6eac8e3dd6..4dbf41e1da50 100644 switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -334,6 +337,7 @@ enum nvme_disposition { +@@ -330,6 +333,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1545,7 +1545,7 @@ index cd6eac8e3dd6..4dbf41e1da50 100644 }; static inline enum nvme_disposition nvme_decide_disposition(struct request *req) -@@ -341,15 +345,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -337,15 +341,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if (likely(nvme_req(req)->status == 0)) return COMPLETE; @@ -1565,7 +1565,7 @@ index cd6eac8e3dd6..4dbf41e1da50 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -377,6 +382,14 @@ static inline void nvme_end_req(struct request *req) +@@ -373,6 +378,14 @@ static inline void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1580,7 +1580,7 @@ index cd6eac8e3dd6..4dbf41e1da50 100644 void nvme_complete_rq(struct request *req) { trace_nvme_complete_rq(req); -@@ -395,6 +408,9 @@ void nvme_complete_rq(struct request *req) +@@ -391,6 +404,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -1638,10 +1638,10 @@ index 1b31f19e1053..4ffdabb4f223 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 1ea908d43e17..62b8844b2321 100644 +index f4b674a8ce20..181cbac05cef 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -775,6 +775,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -776,6 +776,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1649,7 +1649,7 @@ index 1ea908d43e17..62b8844b2321 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -810,6 +811,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -811,6 +812,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -1756,10 +1756,10 @@ index 4ceeb75fc899..be23656279ff 100644 struct pci_driver *drv; struct pci_dev *dev; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 65f7f6b0576c..27398de38c0c 100644 +index da829274fc66..bb6e79ec3d00 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4272,6 +4272,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4284,6 +4284,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -2051,10 +2051,10 @@ index 3f6cb2a5c2c2..68768100a1ac 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 47a1c8bddf86..e309d992e2ad 100644 +index 1460857026e0..7e1964891089 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5683,6 +5683,13 @@ static void hub_event(struct work_struct *work) +@@ -5688,6 +5688,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -2203,10 +2203,10 @@ index ccd4d3f91c98..e64643e3e364 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 a890428bcc1a..b5f81c03093c 100644 +index 08ba5995aa8b..5745b60e3b78 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -508,4 +508,23 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -517,4 +517,23 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) @@ -2320,10 +2320,10 @@ index f5844908a089..901d51012738 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index 60d423d8f0c4..a3a717230745 100644 +index b957eeb89c7a..16c883f374aa 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1490,6 +1490,22 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1491,6 +1491,22 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -3289,7 +3289,7 @@ index eaa4b5c920a2..27563a5fedcd 100644 count, align); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 6bfa33217914..92d936f34b27 100644 +index d10f93aac1c8..253455a77e19 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -21,6 +21,7 @@ @@ -3300,7 +3300,7 @@ index 6bfa33217914..92d936f34b27 100644 /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2366,6 +2367,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2373,6 +2374,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -3313,7 +3313,7 @@ index 6bfa33217914..92d936f34b27 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2595,6 +2602,7 @@ int main(int argc, char **argv) +@@ -2602,6 +2609,7 @@ int main(int argc, char **argv) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); |