diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 16:37:08 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 16:37:08 -0400 |
| commit | ab89ce07269d4082fabe2b7d13a70f34e3c47ab6 (patch) | |
| tree | d4dcf1d9aa0a3929ea74fdfcef0296d5271f4abc | |
| parent | bd9ef39b60fd1727f40c84721da81bda186f4639 (diff) | |
| download | longterm-queue-4.12-ab89ce07269d4082fabe2b7d13a70f34e3c47ab6.tar.gz | |
scsi: drop lpfc patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/scsi-lpfc-Fix-warning-messages-when-NVME_TARGET_FC-n.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/scsi-lpfc-Fix-warning-messages-when-NVME_TARGET_FC-n.patch b/queue/scsi-lpfc-Fix-warning-messages-when-NVME_TARGET_FC-n.patch deleted file mode 100644 index 6038851..0000000 --- a/queue/scsi-lpfc-Fix-warning-messages-when-NVME_TARGET_FC-n.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2299e4323d2bf6e0728fdc6b9e8e9704978d2dd7 Mon Sep 17 00:00:00 2001 -From: Dick Kennedy <dick.kennedy@broadcom.com> -Date: Fri, 29 Sep 2017 17:34:31 -0700 -Subject: [PATCH] scsi: lpfc: Fix warning messages when NVME_TARGET_FC not - defined - -commit 2299e4323d2bf6e0728fdc6b9e8e9704978d2dd7 upstream. - -Warning messages when NVME_TARGET_FC not defined on ppc builds - -The lpfc_nvmet_replenish_context() function is only meaningful when NVME -target mode enabled. Surround the function body with ifdefs for target -mode enablement. - -Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> -Signed-off-by: James Smart <james.smart@broadcom.com> -Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> -Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> -Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> - -diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c -index 0b7c1a49e203..313d5c10e0ad 100644 ---- a/drivers/scsi/lpfc/lpfc_nvmet.c -+++ b/drivers/scsi/lpfc/lpfc_nvmet.c -@@ -1457,6 +1457,7 @@ static struct lpfc_nvmet_ctxbuf * - lpfc_nvmet_replenish_context(struct lpfc_hba *phba, - struct lpfc_nvmet_ctx_info *current_infop) - { -+#if (IS_ENABLED(CONFIG_NVME_TARGET_FC)) - struct lpfc_nvmet_ctxbuf *ctx_buf = NULL; - struct lpfc_nvmet_ctx_info *get_infop; - int i; -@@ -1504,6 +1505,7 @@ lpfc_nvmet_replenish_context(struct lpfc_hba *phba, - get_infop = get_infop->nvmet_ctx_next_cpu; - } - -+#endif - /* Nothing found, all contexts for the MRQ are in-flight */ - return NULL; - } --- -2.15.0 - diff --git a/queue/series b/queue/series index 6531628..e4a3565 100644 --- a/queue/series +++ b/queue/series @@ -29,7 +29,6 @@ ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch scsi-lpfc-Fix-secure-firmware-updates.patch scsi-lpfc-PLOGI-failures-during-NPIV-testing.patch -scsi-lpfc-Fix-warning-messages-when-NVME_TARGET_FC-n.patch i40e-fix-client-notify-of-VF-reset.patch vfio-pci-Virtualize-Maximum-Payload-Size.patch ARM-exynos_defconfig-Enable-UAS-support-for-Odroid-H.patch |