* [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS
@ 2014-09-19 23:50 Randy Dunlap
2014-09-22 14:42 ` Christoph Hellwig
2014-09-22 16:11 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Randy Dunlap @ 2014-09-19 23:50 UTC (permalink / raw)
To: netdev, David Miller, linux-scsi; +Cc: James Bottomley, Anish Bhatt
From: Randy Dunlap <rdunlap@infradead.org>
Fix kconfig dependency warnings which can lead to build errors:
warning: (SCSI_BNX2X_FCOE && LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)
warning: (FCOE && FCOE_FNIC) selects LIBFCOE which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
---
drivers/scsi/Kconfig | 3 +++
drivers/scsi/qla2xxx/Kconfig | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--- linux-next-20140918.orig/drivers/scsi/Kconfig
+++ linux-next-20140918/drivers/scsi/Kconfig
@@ -601,6 +601,7 @@ config LIBFC
config LIBFCOE
tristate "LibFCoE module"
+ depends on SCSI_FC_ATTRS
select LIBFC
---help---
Library for Fibre Channel over Ethernet module
@@ -608,6 +609,7 @@ config LIBFCOE
config FCOE
tristate "FCoE module"
depends on PCI
+ depends on SCSI_FC_ATTRS
select LIBFCOE
---help---
Fibre Channel over Ethernet module
@@ -615,6 +617,7 @@ config FCOE
config FCOE_FNIC
tristate "Cisco FNIC Driver"
depends on PCI && X86
+ depends on SCSI_FC_ATTRS
select LIBFCOE
help
This is support for the Cisco PCI-Express FCoE HBA.
--- linux-next-20140918.orig/drivers/scsi/qla2xxx/Kconfig
+++ linux-next-20140918/drivers/scsi/qla2xxx/Kconfig
@@ -30,7 +30,7 @@ config SCSI_QLA_FC
config TCM_QLA2XXX
tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
- depends on SCSI_QLA_FC && TARGET_CORE
+ depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS
select LIBFC
select BTREE
default n
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS
2014-09-19 23:50 [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS Randy Dunlap
@ 2014-09-22 14:42 ` Christoph Hellwig
2014-09-22 15:49 ` David Miller
2014-09-22 15:56 ` David Miller
2014-09-22 16:11 ` David Miller
1 sibling, 2 replies; 6+ messages in thread
From: Christoph Hellwig @ 2014-09-22 14:42 UTC (permalink / raw)
To: Randy Dunlap
Cc: netdev, David Miller, linux-scsi, James Bottomley, Anish Bhatt
On Fri, Sep 19, 2014 at 04:50:59PM -0700, Randy Dunlap wrote:
> --- linux-next-20140918.orig/drivers/scsi/qla2xxx/Kconfig
> +++ linux-next-20140918/drivers/scsi/qla2xxx/Kconfig
> @@ -30,7 +30,7 @@ config SCSI_QLA_FC
>
> config TCM_QLA2XXX
> tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
> - depends on SCSI_QLA_FC && TARGET_CORE
> + depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS
CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't
need this here. Also any reason not to switch that one over to a
depends as well?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS
2014-09-22 14:42 ` Christoph Hellwig
@ 2014-09-22 15:49 ` David Miller
2014-09-22 15:56 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2014-09-22 15:49 UTC (permalink / raw)
To: hch; +Cc: rdunlap, netdev, linux-scsi, jbottomley, anish
From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 22 Sep 2014 07:42:13 -0700
> On Fri, Sep 19, 2014 at 04:50:59PM -0700, Randy Dunlap wrote:
>> --- linux-next-20140918.orig/drivers/scsi/qla2xxx/Kconfig
>> +++ linux-next-20140918/drivers/scsi/qla2xxx/Kconfig
>> @@ -30,7 +30,7 @@ config SCSI_QLA_FC
>>
>> config TCM_QLA2XXX
>> tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
>> - depends on SCSI_QLA_FC && TARGET_CORE
>> + depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS
>
> CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't
> need this here. Also any reason not to switch that one over to a
> depends as well?
>
Yes, all selects of SCSI_FC_ATTRS have to be changed to a depends.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS
2014-09-22 14:42 ` Christoph Hellwig
2014-09-22 15:49 ` David Miller
@ 2014-09-22 15:56 ` David Miller
2014-09-22 16:44 ` Christoph Hellwig
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2014-09-22 15:56 UTC (permalink / raw)
To: hch; +Cc: rdunlap, netdev, linux-scsi, jbottomley, anish
From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 22 Sep 2014 07:42:13 -0700
> On Fri, Sep 19, 2014 at 04:50:59PM -0700, Randy Dunlap wrote:
>> --- linux-next-20140918.orig/drivers/scsi/qla2xxx/Kconfig
>> +++ linux-next-20140918/drivers/scsi/qla2xxx/Kconfig
>> @@ -30,7 +30,7 @@ config SCSI_QLA_FC
>>
>> config TCM_QLA2XXX
>> tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
>> - depends on SCSI_QLA_FC && TARGET_CORE
>> + depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS
>
> CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't
> need this here. Also any reason not to switch that one over to a
> depends as well?
Christoph, I understand your confusion now, in the networking tree SCSI_QLA_FC
"depends" on SCSI_FC_ATTRS now, and this is what Randy's patches are against.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS
2014-09-19 23:50 [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS Randy Dunlap
2014-09-22 14:42 ` Christoph Hellwig
@ 2014-09-22 16:11 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2014-09-22 16:11 UTC (permalink / raw)
To: rdunlap; +Cc: netdev, linux-scsi, jbottomley, anish
From: Randy Dunlap <rdunlap@infradead.org>
Date: Fri, 19 Sep 2014 16:50:59 -0700
> From: Randy Dunlap <rdunlap@infradead.org>
>
> Fix kconfig dependency warnings which can lead to build errors:
>
> warning: (SCSI_BNX2X_FCOE && LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)
>
> warning: (FCOE && FCOE_FNIC) selects LIBFCOE which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Randy, I think we need to propagate usage of depends into LIBFC and LIBFCOE as well.
I'm playing around with the following patch and will probably use this to resolve
everything.
Thanks.
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index b745012..bd85fb4 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -592,21 +592,21 @@ config LIBFC
config LIBFCOE
tristate "LibFCoE module"
- select LIBFC
+ depends on LIBFC
---help---
Library for Fibre Channel over Ethernet module
config FCOE
tristate "FCoE module"
depends on PCI
- select LIBFCOE
+ depends on LIBFCOE
---help---
Fibre Channel over Ethernet module
config FCOE_FNIC
tristate "Cisco FNIC Driver"
depends on PCI && X86
- select LIBFCOE
+ depends on LIBFCOE
help
This is support for the Cisco PCI-Express FCoE HBA.
diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig
index 02b0ba8..0978828 100644
--- a/drivers/scsi/bnx2fc/Kconfig
+++ b/drivers/scsi/bnx2fc/Kconfig
@@ -2,11 +2,11 @@ config SCSI_BNX2X_FCOE
tristate "QLogic NetXtreme II FCoE support"
depends on PCI
depends on (IPV6 || IPV6=n)
+ depends on LIBFC
+ depends on LIBFCOE
select NETDEVICES
select ETHERNET
select NET_VENDOR_BROADCOM
- select LIBFC
- select LIBFCOE
select CNIC
---help---
This driver supports FCoE offload for the QLogic NetXtreme II
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 7d65776..113e6c9 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -31,7 +31,7 @@ config SCSI_QLA_FC
config TCM_QLA2XXX
tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
depends on SCSI_QLA_FC && TARGET_CORE
- select LIBFC
+ depends on LIBFC
select BTREE
default n
---help---
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS
2014-09-22 15:56 ` David Miller
@ 2014-09-22 16:44 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2014-09-22 16:44 UTC (permalink / raw)
To: David Miller; +Cc: hch, rdunlap, netdev, linux-scsi, jbottomley, anish
On Mon, Sep 22, 2014 at 11:56:58AM -0400, David Miller wrote:
> > CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't
> > need this here. Also any reason not to switch that one over to a
> > depends as well?
>
> Christoph, I understand your confusion now, in the networking tree SCSI_QLA_FC
> "depends" on SCSI_FC_ATTRS now, and this is what Randy's patches are against.
Ok. The fixes look fine for me if you checked they make sense vs the net
tree.
Acked-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-22 16:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-19 23:50 [PATCH] scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS Randy Dunlap
2014-09-22 14:42 ` Christoph Hellwig
2014-09-22 15:49 ` David Miller
2014-09-22 15:56 ` David Miller
2014-09-22 16:44 ` Christoph Hellwig
2014-09-22 16:11 ` David Miller
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).