The patch titled revert ISCSI build failure, use 'depends' instead of 'select' has been removed from the -mm tree. Its filename was revert-iscsi-build-failure-use-depends-instead-of.patch This patch was dropped because it was nacked by the maintainer ------------------------------------------------------ Subject: revert ISCSI build failure, use 'depends' instead of 'select' From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Remove all (2) "select NET" instances from all kernel Kconfig files. Use "depends on" for them instead. As Roman Zippel commented, "please don't select NET, it's way too broad." This affects all IEEE1394 drivers and some SCSI drivers. Networking (NET) will have to be enabled before any IEEE1394 or a few SCSI drivers can be enabled. In particular for SCSI, the QLogic ISP4xxx driver (SCSI_QLA_ISCSI) and any FiberChannel drivers are affected. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ieee1394/Kconfig | 5 ++++- drivers/scsi/Kconfig | 13 +++++++++---- drivers/scsi/qla4xxx/Kconfig | 8 ++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff -puN drivers/ieee1394/Kconfig~revert-iscsi-build-failure-use-depends-instead-of drivers/ieee1394/Kconfig --- a/drivers/ieee1394/Kconfig~revert-iscsi-build-failure-use-depends-instead-of +++ a/drivers/ieee1394/Kconfig @@ -2,10 +2,13 @@ menu "IEEE 1394 (FireWire) support" +comment "NOTE: IEEE 1394 support requires the Networking (NET) option to be enabled first" + depends on !NET + config IEEE1394 tristate "IEEE 1394 (FireWire) support" depends on PCI || BROKEN - select NET + depends on NET help IEEE 1394 describes a high performance serial bus, which is also known as FireWire(tm) or i.Link(tm) and is used for connecting all diff -puN drivers/scsi/Kconfig~revert-iscsi-build-failure-use-depends-instead-of drivers/scsi/Kconfig --- a/drivers/scsi/Kconfig~revert-iscsi-build-failure-use-depends-instead-of +++ a/drivers/scsi/Kconfig @@ -29,10 +29,15 @@ config SCSI However, do not compile this as a module if your root file system (the one containing the directory /) is located on a SCSI device. +comment "NOTE: SCSI_NETLINK requires the Networking (NET) option to be enabled first" + depends on !NET + config SCSI_NETLINK - bool - default n - select NET + bool "SCSI Netlink messages" + depends on NET + ---help--- + SCSI uses Netlink messages for passing Fiber Channel transport + information. config SCSI_PROC_FS bool "legacy /proc/scsi/ support" @@ -229,7 +234,7 @@ config SCSI_SPI_ATTRS config SCSI_FC_ATTRS tristate "FiberChannel Transport Attributes" depends on SCSI - select SCSI_NETLINK + depends on SCSI_NETLINK help If you wish to export transport-specific information about each attached FiberChannel device to sysfs, say Y. diff -puN drivers/scsi/qla4xxx/Kconfig~revert-iscsi-build-failure-use-depends-instead-of drivers/scsi/qla4xxx/Kconfig --- a/drivers/scsi/qla4xxx/Kconfig~revert-iscsi-build-failure-use-depends-instead-of +++ a/drivers/scsi/qla4xxx/Kconfig @@ -1,7 +1,7 @@ config SCSI_QLA_ISCSI tristate "QLogic ISP4XXX host adapter family support" - depends on PCI && SCSI && NET - select SCSI_ISCSI_ATTRS + depends on PCI && SCSI + depends on SCSI_ISCSI_ATTRS ---help--- - This driver supports the QLogic 40xx (ISP4XXX) iSCSI host - adapter family. + This driver supports the QLogic 40xx (ISP4XXX) iSCSI host + adapter family. _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch update-some-docbook-comments.patch docbook-merge-journal-api-into-filesystemstmpl.patch lkdtm-cleanup-headers-and-module_param-module_parm_desc.patch revert-iscsi-build-failure-use-depends-instead-of.patch git-acpi.patch git-dvb.patch git-ieee1394.patch mtd-fix-printk-format-warning.patch com20020-build-fix.patch parisc-fix-module_param-iommu-permission.patch pci-i386-style-cleanups.patch tifm-fix-null-ptr-and-style.patch kconfig-printk_time-depends-on-printk.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html