* [PATCH A] scsi: fdomain: fix building pcmcia front-end
@ 2019-07-22 12:19 Arnd Bergmann
2019-07-22 12:19 ` [PATCH B] " Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2019-07-22 12:19 UTC (permalink / raw)
To: James E . J . Bottomley, Martin K . Petersen
Cc: Ondrej Zary, Hannes Reinecke, Johannes Thumshirn, linux-scsi,
linux-kernel, Arnd Bergmann
We get a warning when CONFIG_SCSI_LOWLEVEL is disabled here:
WARNING: unmet direct dependencies detected for SCSI_FDOMAIN
Depends on [n]: SCSI_LOWLEVEL [=n] && SCSI [=y]
Selected by [m]:
- PCMCIA_FDOMAIN [=m] && SCSI_LOWLEVEL_PCMCIA [=y] && SCSI [=y] && PCMCIA [=y] && m && MODULES [=y]
Move the common support outside of the SCSI_LOWLEVEL section.
Alternatively, we could move all of SCSI_LOWLEVEL_PCMCIA into
SCSI_LOWLEVEL. This would be more sensible, but might cause
surprises for users that have SCSI_LOWLEVEL disabled.
Fixes: 7d47fa065e62 ("scsi: fdomain: Add PCMCIA support")
Link: https://lore.kernel.org/lkml/20190617111937.2355936-1-arnd@arndb.de/t
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
One of two ways to fix the problem, please pick either
There was some confusion about this the first time I posted
it. As Ondrej pointed out, there is no user visible top-level
option here, just a hidden symbol.
drivers/scsi/Kconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 75f66f8ad3ea..dffe4b31e205 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -642,10 +642,6 @@ config SCSI_DMX3191D
To compile this driver as a module, choose M here: the
module will be called dmx3191d.
-config SCSI_FDOMAIN
- tristate
- depends on SCSI
-
config SCSI_FDOMAIN_PCI
tristate "Future Domain TMC-3260/AHA-2920A PCI SCSI support"
depends on PCI && SCSI
@@ -1527,6 +1523,10 @@ endif # SCSI_LOWLEVEL
source "drivers/scsi/pcmcia/Kconfig"
+config SCSI_FDOMAIN
+ tristate
+ depends on SCSI
+
source "drivers/scsi/device_handler/Kconfig"
endmenu
--
2.20.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH B] scsi: fdomain: fix building pcmcia front-end
2019-07-22 12:19 [PATCH A] scsi: fdomain: fix building pcmcia front-end Arnd Bergmann
@ 2019-07-22 12:19 ` Arnd Bergmann
2019-07-23 2:07 ` Martin K. Petersen
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2019-07-22 12:19 UTC (permalink / raw)
To: James E . J . Bottomley, Martin K . Petersen
Cc: Ondrej Zary, Hannes Reinecke, Johannes Thumshirn, linux-scsi,
linux-kernel, Arnd Bergmann
We get a warning when CONFIG_SCSI_LOWLEVEL is disabled here:
WARNING: unmet direct dependencies detected for SCSI_FDOMAIN
Depends on [n]: SCSI_LOWLEVEL [=n] && SCSI [=y]
Selected by [m]:
- PCMCIA_FDOMAIN [=m] && SCSI_LOWLEVEL_PCMCIA [=y] && SCSI [=y] && PCMCIA [=y] && m && MODULES [=y]
Move all of SCSI_LOWLEVEL_PCMCIA inside of the existing
SCSI_LOWLEVEL section. Very few people use the PCMCIA support
these days, and they likely don't mind having to turn on
SCSI_LOWLEVEL as well. This way we avoid the link error
and get a more sensible structure.
Fixes: 7d47fa065e62 ("scsi: fdomain: Add PCMCIA support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
One of two ways to fix the problem, please pick either
drivers/scsi/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 75f66f8ad3ea..1b92f3c19ff3 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1523,10 +1523,10 @@ config SCSI_VIRTIO
source "drivers/scsi/csiostor/Kconfig"
-endif # SCSI_LOWLEVEL
-
source "drivers/scsi/pcmcia/Kconfig"
+endif # SCSI_LOWLEVEL
+
source "drivers/scsi/device_handler/Kconfig"
endmenu
--
2.20.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH B] scsi: fdomain: fix building pcmcia front-end
2019-07-22 12:19 ` [PATCH B] " Arnd Bergmann
@ 2019-07-23 2:07 ` Martin K. Petersen
0 siblings, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2019-07-23 2:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: James E . J . Bottomley, Martin K . Petersen, Ondrej Zary,
Hannes Reinecke, Johannes Thumshirn, linux-scsi, linux-kernel
Arnd,
> Move all of SCSI_LOWLEVEL_PCMCIA inside of the existing SCSI_LOWLEVEL
> section. Very few people use the PCMCIA support these days, and they
> likely don't mind having to turn on SCSI_LOWLEVEL as well. This way we
> avoid the link error and get a more sensible structure.
Applied to 5.3/scsi-fixes. Thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-23 2:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-22 12:19 [PATCH A] scsi: fdomain: fix building pcmcia front-end Arnd Bergmann
2019-07-22 12:19 ` [PATCH B] " Arnd Bergmann
2019-07-23 2:07 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).