diff options
Diffstat (limited to 'patch-6.1-redhat.patch')
| -rw-r--r-- | patch-6.1-redhat.patch | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index 21631397a..67f4db5d7 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -166,10 +166,10 @@ index 22dc1d6936bc..7fc3e9c5bc4c 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 0e48d1e4c578..92a60d317e99 100644 +index fb8463c028b2..bec3a70f9e91 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1197,7 +1197,7 @@ endchoice +@@ -1196,7 +1196,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -178,7 +178,7 @@ index 0e48d1e4c578..92a60d317e99 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1436,6 +1436,7 @@ config XEN +@@ -1435,6 +1435,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -458,10 +458,10 @@ index 558664d169fc..8510440fa17e 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 cf8c7fd59ada..28a8189be64f 100644 +index 954386a2b500..8f49d54e838e 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c -@@ -690,6 +690,24 @@ int ahci_stop_engine(struct ata_port *ap) +@@ -727,6 +727,24 @@ int ahci_stop_engine(struct ata_port *ap) tmp &= ~PORT_CMD_START; writel(tmp, port_mmio + PORT_CMD); @@ -749,10 +749,10 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index 311eee599ce9..2460c6bd46f8 100644 +index bb1f423f4ace..efc96776f761 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c -@@ -322,19 +322,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) +@@ -321,19 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) { struct rmi_data *hdata = hid_get_drvdata(hdev); struct rmi_device *rmi_dev = hdata->xport.rmi_dev; @@ -772,7 +772,7 @@ index 311eee599ce9..2460c6bd46f8 100644 return 1; } -@@ -591,56 +584,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { +@@ -589,56 +582,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { .reset = rmi_hid_reset, }; @@ -829,7 +829,7 @@ index 311eee599ce9..2460c6bd46f8 100644 static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) { struct rmi_data *data = NULL; -@@ -713,18 +656,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) +@@ -711,18 +654,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) mutex_init(&data->page_mutex); @@ -1226,7 +1226,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 8d5a7ae19844..f3939183c346 100644 +index 059737c1a2c1..3de14ca20059 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1293,7 +1293,7 @@ index 8d5a7ae19844..f3939183c346 100644 #ifdef CONFIG_NVME_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 6ef497c75a16..c019294e1058 100644 +index 00f2f81e20fa..082c2b3ed0f5 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) @@ -1329,7 +1329,7 @@ index 6ef497c75a16..c019294e1058 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -871,8 +877,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -872,8 +878,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1340,10 +1340,10 @@ index 6ef497c75a16..c019294e1058 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 1bdf714dcd9e..10e45b82466c 100644 +index a29877217ee6..ec2e6c7692af 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -844,6 +844,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -870,6 +870,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); @@ -1351,7 +1351,7 @@ index 1bdf714dcd9e..10e45b82466c 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, __le32 anagrpid); -@@ -880,6 +881,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -906,6 +907,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -1531,7 +1531,7 @@ index 50a577ac3bb4..6f862b855ccf 100644 { 0 } }; diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index a47bcce3c9c7..094944a52866 100644 +index f8e832b1bc46..307d4e697830 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ @@ -1632,7 +1632,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 f6c37a97544e..a1488544300e 100644 +index 9be4ba61a076..7db5112a062f 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); @@ -1664,10 +1664,10 @@ index f6c37a97544e..a1488544300e 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 bd6a5f1bd532..3d460a12baa3 100644 +index 8e24ebcebfe5..25aa49292397 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -12606,6 +12606,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) +@@ -12618,6 +12618,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) * The pci device ids are defined in mpi/mpi2_cnfg.h. */ static const struct pci_device_id mpt3sas_pci_table[] = { @@ -1675,7 +1675,7 @@ index bd6a5f1bd532..3d460a12baa3 100644 /* Spitfire ~ 2004 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12624,6 +12625,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12636,6 +12637,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, PCI_ANY_ID, PCI_ANY_ID }, @@ -1683,7 +1683,7 @@ index bd6a5f1bd532..3d460a12baa3 100644 /* Thunderbolt ~ 2208 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12648,9 +12650,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12660,9 +12662,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, PCI_ANY_ID, PCI_ANY_ID }, @@ -1696,10 +1696,10 @@ index bd6a5f1bd532..3d460a12baa3 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 0bd0fd1042df..821503d07999 100644 +index 2c85f3cce726..633147b8ed14 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -8050,6 +8050,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -8068,6 +8068,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -1707,7 +1707,7 @@ index 0bd0fd1042df..821503d07999 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -8062,13 +8063,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -8080,13 +8081,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, @@ -2604,7 +2604,7 @@ index 7b373a5e861f..6b880dcbdeda 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index 70c0b2c6fef8..ef89a3b08c2f 100644 +index d02d39c7174e..1436f083cfb6 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -524,6 +524,7 @@ static struct module_attribute modinfo_##field = { \ @@ -2647,10 +2647,10 @@ 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 c6eb8f8db0c0..da82fb0fbb1b 100644 +index da323209f583..fefa065d5e37 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -429,6 +429,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -426,6 +426,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, [ TAINT_TEST ] = { 'N', ' ', true }, |