[PATCH 3.16.y-ckt 119/133] scsi_dh: fix randconfig build error

Luis Henriques luis.henriques at canonical.com
Wed Sep 30 09:51:07 UTC 2015


3.16.7-ckt18 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Christoph Hellwig <hch at lst.de>

commit 294ab783ad98066b87296db1311c7ba2a60206a5 upstream.

It looks like the Kconfig check that was meant to fix this (commit
fe9233fb6914a0eb20166c967e3020f7f0fba2c9 [SCSI] scsi_dh: fix kconfig related
build errors) was actually reversed, but no-one noticed until the new set of
patches which separated DM and SCSI_DH).

Fixes: fe9233fb6914a0eb20166c967e3020f7f0fba2c9
Signed-off-by: Christoph Hellwig <hch at lst.de>
Tested-by: Mike Snitzer <snitzer at redhat.com>
Signed-off-by: James Bottomley <JBottomley at Odin.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/md/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 5bdedf6df153..c5a97771f570 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -354,7 +354,7 @@ config DM_MULTIPATH
 	# of SCSI_DH if the latter isn't defined but if
 	# it is, DM_MULTIPATH must depend on it.  We get a build
 	# error if SCSI_DH=m and DM_MULTIPATH=y
-	depends on SCSI_DH || !SCSI_DH
+	depends on !SCSI_DH || SCSI
 	---help---
 	  Allow volume managers to support multipath hardware.
 




More information about the kernel-team mailing list