drop 592642e6b11e620e4b43189f8072752429fc8dc3 from 5.4 4.14 and 4.19

diff --git a/queue-4.14/scsi-qedf-populate-sysfs-attributes-for-vport.patch b/queue-4.14/scsi-qedf-populate-sysfs-attributes-for-vport.patch
deleted file mode 100644 (file)
index 7f2ea69..0000000
--- a/queue-4.14/scsi-qedf-populate-sysfs-attributes-for-vport.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 592642e6b11e620e4b43189f8072752429fc8dc3 Mon Sep 17 00:00:00 2001
-From: Saurav Kashyap <skashyap@marvell.com>
-Date: Mon, 19 Sep 2022 06:44:34 -0700
-Subject: scsi: qedf: Populate sysfs attributes for vport
-
-From: Saurav Kashyap <skashyap@marvell.com>
-
-commit 592642e6b11e620e4b43189f8072752429fc8dc3 upstream.
-
-Few vport parameters were displayed by systool as 'Unknown' or 'NULL'.
-Copy speed, supported_speed, frame_size and update port_type for NPIV port.
-
-Link: https://lore.kernel.org/r/20220919134434.3513-1-njavali@marvell.com
-Cc: stable@vger.kernel.org
-Tested-by: Guangwu Zhang <guazhang@redhat.com>
-Reviewed-by: John Meneghini <jmeneghi@redhat.com>
-Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
-Signed-off-by: Nilesh Javali <njavali@marvell.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/scsi/qedf/qedf_main.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
---- a/drivers/scsi/qedf/qedf_main.c
-+++ b/drivers/scsi/qedf/qedf_main.c
-@@ -1631,6 +1631,27 @@ static int qedf_vport_create(struct fc_v
-               fc_vport_setlink(vn_port);
-       }
- 
-+      /* Set symbolic node name */
-+      if (base_qedf->pdev->device == QL45xxx)
-+              snprintf(fc_host_symbolic_name(vn_port->host), 256,
-+                       "Marvell FastLinQ 45xxx FCoE v%s", QEDF_VERSION);
-+
-+      if (base_qedf->pdev->device == QL41xxx)
-+              snprintf(fc_host_symbolic_name(vn_port->host), 256,
-+                       "Marvell FastLinQ 41xxx FCoE v%s", QEDF_VERSION);
-+
-+      /* Set supported speed */
-+      fc_host_supported_speeds(vn_port->host) = n_port->link_supported_speeds;
-+
-+      /* Set speed */
-+      vn_port->link_speed = n_port->link_speed;
-+
-+      /* Set port type */
-+      fc_host_port_type(vn_port->host) = FC_PORTTYPE_NPIV;
-+
-+      /* Set maxframe size */
-+      fc_host_maxframe_size(vn_port->host) = n_port->mfs;
-+
-       QEDF_INFO(&(base_qedf->dbg_ctx), QEDF_LOG_NPIV, "vn_port=%p.\n",
-                  vn_port);
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 8c91be1cd61e8f5965975b7be0bd8205e6fa861d..23f78ed1c663d5cf4c6d48a28bd299d502770ad4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -61,4 +61,3 @@ revert-fs-check-fmode_lseek-to-control-internal-pipe.patch
 parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch
 um-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch
 pci-sanitise-firmware-bar-assignments-behind-a-pci-pci-bridge.patch
-scsi-qedf-populate-sysfs-attributes-for-vport.patch

diff --git a/queue-4.19/scsi-qedf-populate-sysfs-attributes-for-vport.patch b/queue-4.19/scsi-qedf-populate-sysfs-attributes-for-vport.patch
deleted file mode 100644 (file)
index a684cf7..0000000
--- a/queue-4.19/scsi-qedf-populate-sysfs-attributes-for-vport.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 592642e6b11e620e4b43189f8072752429fc8dc3 Mon Sep 17 00:00:00 2001
-From: Saurav Kashyap <skashyap@marvell.com>
-Date: Mon, 19 Sep 2022 06:44:34 -0700
-Subject: scsi: qedf: Populate sysfs attributes for vport
-
-From: Saurav Kashyap <skashyap@marvell.com>
-
-commit 592642e6b11e620e4b43189f8072752429fc8dc3 upstream.
-
-Few vport parameters were displayed by systool as 'Unknown' or 'NULL'.
-Copy speed, supported_speed, frame_size and update port_type for NPIV port.
-
-Link: https://lore.kernel.org/r/20220919134434.3513-1-njavali@marvell.com
-Cc: stable@vger.kernel.org
-Tested-by: Guangwu Zhang <guazhang@redhat.com>
-Reviewed-by: John Meneghini <jmeneghi@redhat.com>
-Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
-Signed-off-by: Nilesh Javali <njavali@marvell.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/scsi/qedf/qedf_main.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
---- a/drivers/scsi/qedf/qedf_main.c
-+++ b/drivers/scsi/qedf/qedf_main.c
-@@ -1667,6 +1667,27 @@ static int qedf_vport_create(struct fc_v
-               fc_vport_setlink(vn_port);
-       }
- 
-+      /* Set symbolic node name */
-+      if (base_qedf->pdev->device == QL45xxx)
-+              snprintf(fc_host_symbolic_name(vn_port->host), 256,
-+                       "Marvell FastLinQ 45xxx FCoE v%s", QEDF_VERSION);
-+
-+      if (base_qedf->pdev->device == QL41xxx)
-+              snprintf(fc_host_symbolic_name(vn_port->host), 256,
-+                       "Marvell FastLinQ 41xxx FCoE v%s", QEDF_VERSION);
-+
-+      /* Set supported speed */
-+      fc_host_supported_speeds(vn_port->host) = n_port->link_supported_speeds;
-+
-+      /* Set speed */
-+      vn_port->link_speed = n_port->link_speed;
-+
-+      /* Set port type */
-+      fc_host_port_type(vn_port->host) = FC_PORTTYPE_NPIV;
-+
-+      /* Set maxframe size */
-+      fc_host_maxframe_size(vn_port->host) = n_port->mfs;
-+
-       QEDF_INFO(&(base_qedf->dbg_ctx), QEDF_LOG_NPIV, "vn_port=%p.\n",
-                  vn_port);
- 

diff --git a/queue-4.19/series b/queue-4.19/series
index 834be5a463e26e4066fb0028d260b0c37cfbc2fc..eb22ea48fc2964dd9aeba9471e7c17ab1bdc3f98 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -51,4 +51,3 @@ parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch
 riscv-allow-prot_write-only-mmap.patch
 um-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch
 pci-sanitise-firmware-bar-assignments-behind-a-pci-pci-bridge.patch
-scsi-qedf-populate-sysfs-attributes-for-vport.patch

diff --git a/queue-5.4/scsi-qedf-populate-sysfs-attributes-for-vport.patch b/queue-5.4/scsi-qedf-populate-sysfs-attributes-for-vport.patch
deleted file mode 100644 (file)
index fb32067..0000000
--- a/queue-5.4/scsi-qedf-populate-sysfs-attributes-for-vport.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 592642e6b11e620e4b43189f8072752429fc8dc3 Mon Sep 17 00:00:00 2001
-From: Saurav Kashyap <skashyap@marvell.com>
-Date: Mon, 19 Sep 2022 06:44:34 -0700
-Subject: scsi: qedf: Populate sysfs attributes for vport
-
-From: Saurav Kashyap <skashyap@marvell.com>
-
-commit 592642e6b11e620e4b43189f8072752429fc8dc3 upstream.
-
-Few vport parameters were displayed by systool as 'Unknown' or 'NULL'.
-Copy speed, supported_speed, frame_size and update port_type for NPIV port.
-
-Link: https://lore.kernel.org/r/20220919134434.3513-1-njavali@marvell.com
-Cc: stable@vger.kernel.org
-Tested-by: Guangwu Zhang <guazhang@redhat.com>
-Reviewed-by: John Meneghini <jmeneghi@redhat.com>
-Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
-Signed-off-by: Nilesh Javali <njavali@marvell.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/scsi/qedf/qedf_main.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
---- a/drivers/scsi/qedf/qedf_main.c
-+++ b/drivers/scsi/qedf/qedf_main.c
-@@ -1818,6 +1818,27 @@ static int qedf_vport_create(struct fc_v
-               fc_vport_setlink(vn_port);
-       }
- 
-+      /* Set symbolic node name */
-+      if (base_qedf->pdev->device == QL45xxx)
-+              snprintf(fc_host_symbolic_name(vn_port->host), 256,
-+                       "Marvell FastLinQ 45xxx FCoE v%s", QEDF_VERSION);
-+
-+      if (base_qedf->pdev->device == QL41xxx)
-+              snprintf(fc_host_symbolic_name(vn_port->host), 256,
-+                       "Marvell FastLinQ 41xxx FCoE v%s", QEDF_VERSION);
-+
-+      /* Set supported speed */
-+      fc_host_supported_speeds(vn_port->host) = n_port->link_supported_speeds;
-+
-+      /* Set speed */
-+      vn_port->link_speed = n_port->link_speed;
-+
-+      /* Set port type */
-+      fc_host_port_type(vn_port->host) = FC_PORTTYPE_NPIV;
-+
-+      /* Set maxframe size */
-+      fc_host_maxframe_size(vn_port->host) = n_port->mfs;
-+
-       QEDF_INFO(&(base_qedf->dbg_ctx), QEDF_LOG_NPIV, "vn_port=%p.\n",
-                  vn_port);
- 

diff --git a/queue-5.4/series b/queue-5.4/series
index 0adaa81f1881264083dd6538179a55c7eabd365f..c3db2a0c37e05285edada364e3c1849067c615c2 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -31,4 +31,3 @@ riscv-pass-mno-relax-only-on-lld-15.0.0.patch
 um-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch
 pci-sanitise-firmware-bar-assignments-behind-a-pci-pci-bridge.patch
 powerpc-boot-explicitly-disable-usage-of-spe-instructions.patch
-scsi-qedf-populate-sysfs-attributes-for-vport.patch