diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:55:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 20:55:33 -0400 |
| commit | 50c3d245353fc385e5594c3283cc3e5b0b04b850 (patch) | |
| tree | af6ce8bf93c91b5d110c2f3e57b2e06400ebd1ed | |
| parent | 7187d036a048fc100a517de2abb8717d44897fed (diff) | |
| download | longterm-queue-4.18-50c3d245353fc385e5594c3283cc3e5b0b04b850.tar.gz | |
lpfc: drop patch for driver not present in 4.18
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/scsi-lpfc-Fix-FDMI-manufacturer-attribute-value.patch | 36 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 37 deletions
diff --git a/queue/scsi-lpfc-Fix-FDMI-manufacturer-attribute-value.patch b/queue/scsi-lpfc-Fix-FDMI-manufacturer-attribute-value.patch deleted file mode 100644 index f870b97..0000000 --- a/queue/scsi-lpfc-Fix-FDMI-manufacturer-attribute-value.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d67f935b79a76ac9d86dde1a27bdd413feb5d987 Mon Sep 17 00:00:00 2001 -From: James Smart <jsmart2021@gmail.com> -Date: Tue, 12 Mar 2019 16:30:20 -0700 -Subject: [PATCH] scsi: lpfc: Fix FDMI manufacturer attribute value - -commit d67f935b79a76ac9d86dde1a27bdd413feb5d987 upstream. - -The FDMI manufacturer value being reported on Linux is inconsistent with -other OS's. - -Set the value to "Emulex Corporation" for consistency. - -Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> -Signed-off-by: James Smart <jsmart2021@gmail.com> -Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> - -diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c -index 7290573110fe..0f09e9b41435 100644 ---- a/drivers/scsi/lpfc/lpfc_ct.c -+++ b/drivers/scsi/lpfc/lpfc_ct.c -@@ -2005,8 +2005,11 @@ lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, - ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue; - memset(ae, 0, 256); - -+ /* This string MUST be consistent with other FC platforms -+ * supported by Broadcom. -+ */ - strncpy(ae->un.AttrString, -- "Broadcom Inc.", -+ "Emulex Corporation", - sizeof(ae->un.AttrString)); - len = strnlen(ae->un.AttrString, - sizeof(ae->un.AttrString)); --- -2.7.4 - diff --git a/queue/series b/queue/series index 0188809..c5df463 100644 --- a/queue/series +++ b/queue/series @@ -133,7 +133,6 @@ drm-amd-display-Set-stream-mode_changed-when-connect.patch media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch media-go7007-avoid-clang-frame-overflow-warning-with.patch media-vimc-zero-the-media_device-on-probe.patch -scsi-lpfc-Fix-FDMI-manufacturer-attribute-value.patch scsi-lpfc-Fix-fc4type-information-for-FDMI.patch media-saa7146-avoid-high-stack-usage-with-clang.patch scsi-lpfc-Fix-SLI3-commands-being-issued-on-SLI4-dev.patch |