From patchwork Fri Jul 21 20:53:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108510 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1261569qge; Fri, 21 Jul 2017 13:54:21 -0700 (PDT) X-Received: by 10.99.38.195 with SMTP id m186mr8420608pgm.323.1500670460923; Fri, 21 Jul 2017 13:54:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500670460; cv=none; d=google.com; s=arc-20160816; b=cZoNmL3dQa9u3Adu37tdm4QQr4EdeE/OFk/i9lvPOgX1AUMbm7jy6MQGneicWu3VQ5 Bkg3Vemocnsh6tH9nla6ds7IFt0Fqqbw8l8PsAx5cvRgqlOJzdIILUqHrRu+eXlvqK+N uNjdFycED7s5jPPxFWsvJ6UYwmbmvl9q2FULJUJEPu2lvSedjZPAEYSyvGcVUOUYS5Vx If5jp9zxht9niFWw0xbsfeufgZhJWL9D0ylWnYE+TVzgim7rEtW5jG5J0VSNxFkONNQZ JRx9S+hw6Fn2Ic6cg3ZTjtLhiX0VlLmnx3v2M0WXvjCak2oMl+5/urqyIM/txDQ8rsri AqXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=wXgy1gSrBnvYQE8hnRDjktfWYxhPhHIq1tX2/nXFuVI=; b=duCEqEHJu3NN975UTDCzZ4xMVNWw2ReA7zlKmTqYTLEcW0Y0hJzKEoUxcZHmgShM2e A2opuDEJKAdDooviGPyfxPtXi4EAfkl8XrOmdj/ZvA+anSHmrkQNVuXcjsUN8Rp/QCDK +x8dzqKARy+x+poETb54+hlkVCEugnciY066xEUUHWntAFw46pEAy7H/mqHRPdR/F2GA tTz/cU0pXlmNn0x1sHUg5oSOP5neaUFvgLP796AkY3Xhx+f2uqZhlV2NtrNdcRRXgpbE Y+T6hXKp6OH2cbYUR2lhS0q88I6nMWmW6XODrjz0O5UoFHjGwMxIGA7NBTLoUm8QGjEU 23PA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si3491857pli.376.2017.07.21.13.54.20; Fri, 21 Jul 2017 13:54:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752048AbdGUUyT (ORCPT + 6 others); Fri, 21 Jul 2017 16:54:19 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:63169 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751996AbdGUUyS (ORCPT ); Fri, 21 Jul 2017 16:54:18 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MDCrg-1dOjpv2LWu-00GVG1; Fri, 21 Jul 2017 22:54:03 +0200 From: Arnd Bergmann To: "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , stable@vger.kernel.org, Hannes Reinecke , Finn Thain , Johannes Thumshirn , James Smart , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH, RESEND] scsi: lpfc: fix linking against modular NVMe support Date: Fri, 21 Jul 2017 22:53:46 +0200 Message-Id: <20170721205401.3374331-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:aJQh8hkTxgsOedbPPl+h9pFO9xpoTJoONCsB+vD/zOwIWoahP9z X18cMVZi0FkJ/wnsSHJqpQ29p4rhbnERwr7zSc9xmPhj4PhBMXmX2t/nkAaJf5zqDZ74X0g LvEKdZzAKpuht1EUjUuIhYuZW1Q1TUPm4GpsCVPG+wrWI4TOIItEf6LJq+Sr0MGmaCVZY2R t877goig9g55nZgkze1/Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:6IDh2NrlAsc=:hYgJD8E94t8vJf8LwtAkHl qhAuFC0OvQ9Elk51aCd9O8i/Fsbh+nk3KXB4WOJDzSdE/VfLQQrJPwSB2KrUw4piTB2QvetPO 6mhpd3t2Y0YxGhUUYS4UC5vsXIJ4/xBoHfE29fj2GQjfG3tGDpSHnV6xS8khOxX1DFecENVEM pcqra+1Q4BZ/YN96YT/8PIHgLDBhSc5n/JNcF4DYR6nSz+t3FAewQp/874qGXldu+z02UgzUf 8DnDpy5iLPL8MKf3wHScmP7x77kOUicpbdQUyMK7IAncCTcBcOQvcQU9kiMEaN9MjjhxoeARy z8UYSy7oeDOWAf96dPCFoTYFlQm7SnusrZtkE4hy0blPT3HH1wZgGUWg5Pp82rV3nCckJQOvk Ed+AuSBwSpe1mRg3q5GtXrMh3RnEf86dLSOXzMyE5dprTlpvLrEfQBoX7Vxsvq/JsJYJjoEwk e4HKRQUKynDesMJXIGwmXt/BqMKbM/LPjN/wlnJEbpiFLHBEToCmKwPSZnqxmK2f0UaKWDg7/ 2JvbSVHy86mExnv1bcoqTV+BWVRKWei1FcrML843xaGYxeKkC0mf0BcvgSHZ2GsCB4rwher3H 8Uw0rcmRtk4au67T1LDT84kyjJHbqm731r+qIA1Gf37BbZtqOhR6Uu+9KyTjmQerOpo856bvI 8erPtzlCWPZl80vluMcqCGb6LRuHNQNY3vby0Oxsz4FQjiBPHTTQJOdaM9yBKQqqSFqnvQbbG 6yCHWcVvZ0NHm+5kDF0k1DE9l82aZ0FfIfXxkA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org When LPFC is built-in but NVMe is a loadable module, we fail to link the kernel: drivers/scsi/built-in.o: In function `lpfc_nvme_create_localport': (.text+0x156a82): undefined reference to `nvme_fc_register_localport' drivers/scsi/built-in.o: In function `lpfc_nvme_destroy_localport': (.text+0x156eaa): undefined reference to `nvme_fc_unregister_remoteport' We can avoid this either by forcing lpfc to be a module, or by disabling NVMe support in this case. This implements the former. Fixes: 7d7080335f8d ("scsi: lpfc: Finalize Kconfig options for nvme") Cc: stable@vger.kernel.org Link: https://patchwork.kernel.org/patch/9636569/ Signed-off-by: Arnd Bergmann --- I originally sent the patch in March 2013, the day after the broken patch made it into Linux-next. Unfortunately there was some misunderstanding about it (James Smart thought the broken patch was the correct version), and my fix never got merged. --- drivers/scsi/Kconfig | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index d384f4f86c26..f4538d7a3016 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1230,6 +1230,8 @@ config SCSI_LPFC tristate "Emulex LightPulse Fibre Channel Support" depends on PCI && SCSI depends on SCSI_FC_ATTRS + depends on NVME_TARGET_FC || NVME_TARGET_FC=n + depends on NVME_FC || NVME_FC=n select CRC_T10DIF ---help--- This lpfc driver supports the Emulex LightPulse