Arnd Bergmann 2cc089e41d staging: lustre: really make lustre dependent on LNet ... A patch intended to add a dependency on LNET for lustre didn't actually do that and instead allowed configurations that contain lustre with lnet but without IPv4 support that subsequently fail to link: warning: (LUSTRE_FS) selects LNET which has unmet direct dependencies (STAGING && INET && m && MODULES) ERROR: "kernel_sendmsg" [drivers/staging/lustre/lnet/lnet/lnet.ko] undefined! ERROR: "sock_create_lite" [drivers/staging/lustre/lnet/lnet/lnet.ko] undefined! ERROR: "sock_release" [drivers/staging/lustre/lnet/lnet/lnet.ko] undefined! ERROR: "release_sock" [drivers/staging/lustre/lnet/klnds/socklnd/ksocklnd.ko] undefined! ERROR: "kernel_sendmsg" [drivers/staging/lustre/lnet/klnds/socklnd/ksocklnd.ko] undefined! ERROR: "tcp_sendpage" [drivers/staging/lustre/lnet/klnds/socklnd/ksocklnd.ko] undefined! This adds the one-line change that was evidently missing from the commit, doing what was intended there to have a correct set of dependencies. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: b08bb6bb5a ("staging: lustre: make lustre dependent on LNet") Acked-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2016-03-22 22:22:13 -04:00
..
accessibility
acpi	libnvdimm for 4.6	2016-03-16 17:45:56 -07:00
amba
android
ata	Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2016-03-18 20:06:46 -07:00
atm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2016-03-17 21:38:27 -07:00
auxdisplay
base	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2016-03-19 16:31:54 -07:00
bcma
block	virtio/vhost: new features, performance improvements, cleanups	2016-03-20 13:28:18 -07:00
bluetooth	Bluetooth: btmrvl_sdio: fix firmware activation failure	2016-03-10 19:51:29 +01:00
bus	arm[64] perf updates for 4.6:	2016-03-21 13:14:16 -07:00
cdrom
char	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-03-21 13:48:00 -07:00
clk	ARM: SoC driver updates for v4.6	2016-03-20 15:40:32 -07:00
clocksource	One of the largest releases for KVM... Hardly any generic improvement,	2016-03-16 09:55:35 -07:00
connector
cpufreq	ARM: SoC driver updates for v4.6	2016-03-20 15:40:32 -07:00
cpuidle
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2016-03-17 21:38:27 -07:00
dca
devfreq
dio
dma	ARM: SoC platform updates for v4.6	2016-03-20 14:57:08 -07:00
dma-buf
edac	EDAC queue for 4.6	2016-03-16 08:36:55 -07:00
eisa
extcon
firewire	IEEE 1394 subsystem patches:	2016-03-19 19:21:24 -07:00
firmware	Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 18:58:18 -07:00
fmc
fpga
gpio	- New Drivers	2016-03-18 10:15:11 -07:00
gpu	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-03-21 13:48:00 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2016-03-17 21:32:20 -07:00
hsi
hv	Char/Misc patches for 4.6-rc1	2016-03-17 13:47:50 -07:00
hwmon	ARM: SoC driver updates for v4.6	2016-03-20 15:40:32 -07:00
hwspinlock
hwtracing
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2016-03-22 12:47:40 -07:00
ide	ide: hpt366: convert to use match_string() helper	2016-03-17 15:09:34 -07:00
idle
iio	- New Drivers	2016-03-18 10:15:11 -07:00
infiniband	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-03-22 12:41:14 -07:00
input	- New Drivers	2016-03-18 10:15:11 -07:00
iommu	IOMMU Updates for Linux v4.6	2016-03-22 11:57:43 -07:00
ipack
irqchip	irqchip/irq-alpine-msi: Release the correct domain on error	2016-03-11 10:06:55 +01:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
leds	leds: triggers: simplify led_trigger_store	2016-03-14 09:22:23 +01:00
lguest
lightnvm	Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block	2016-03-18 17:13:31 -07:00
macintosh
mailbox	Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration	2016-03-20 12:58:32 -07:00
mcb
md	Merge tag 'md/4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md	2016-03-21 14:18:10 -07:00
media	[media] vsp1: use proper dma alloc/free functions	2016-03-21 13:49:01 -07:00
memory	IOMMU Updates for Linux v4.6	2016-03-22 11:57:43 -07:00
memstick
message
mfd	- New Drivers	2016-03-18 10:15:11 -07:00
misc	Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 19:08:56 -07:00
mmc	MMC core:	2016-03-21 14:35:52 -07:00
mtd	This is the bulk of GPIO changes for kernel v4.6:	2016-03-17 21:05:32 -07:00
net	virtio/vhost: new features, performance improvements, cleanups	2016-03-20 13:28:18 -07:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
ntb
nubus
nvdimm	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2016-03-19 16:31:54 -07:00
nvme	Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block	2016-03-18 17:13:31 -07:00
nvmem
of	DeviceTree updates for 4.6:	2016-03-19 15:15:07 -07:00
oprofile
parisc	PCI changes for the v4.6 merge window:	2016-03-16 14:45:55 -07:00
parport
pci	Revert "PCI: dra7xx: Mark driver as broken"	2016-03-22 07:50:11 -05:00
pcmcia
perf	drivers/perf: arm_pmu: avoid NULL dereference when not using devicetree	2016-03-21 11:36:17 +00:00
phy
pinctrl	Merge branch 'akpm' (patches from Andrew)	2016-03-18 19:26:54 -07:00
platform	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-03-21 13:48:00 -07:00
pnp	PNP / ACPI: add ACPI_RESOURCE_TYPE_SERIAL_BUS as a valid type	2016-03-09 23:50:55 +01:00
power	Merge branch 'akpm' (patches from Andrew)	2016-03-18 19:26:54 -07:00
powercap	powercap/rapl: track lead cpu per package	2016-03-09 00:26:44 +01:00
pps
ps3
ptp	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-15 12:13:56 -07:00
pwm
rapidio
ras
regulator	- New Drivers	2016-03-18 10:15:11 -07:00
remoteproc
reset
rpmsg
rtc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2016-03-17 21:38:27 -07:00
s390	virtio/vhost: new features, performance improvements, cleanups	2016-03-20 13:28:18 -07:00
sbus
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-03-22 12:41:14 -07:00
sfi
sh
sn
soc	ARM: SoC driver updates for v4.6	2016-03-20 15:40:32 -07:00
spi	dmaengine updates for 4.6	2016-03-17 12:34:54 -07:00
spmi
ssb
staging	staging: lustre: really make lustre dependent on LNet	2016-03-22 22:22:13 -04:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-03-22 12:41:14 -07:00
tc
thermal
thunderbolt
tty	xen: features and fixes for 4.6-rc0	2016-03-22 12:55:17 -07:00
uio
usb	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-03-22 12:41:14 -07:00
uwb
vfio	VFIO updates for v4.6-rc1	2016-03-17 13:05:09 -07:00
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-03-22 12:41:14 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-03-21 13:48:00 -07:00
virt
virtio	virtio/vhost: new features, performance improvements, cleanups	2016-03-20 13:28:18 -07:00
vlynq
vme
w1
watchdog	Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 18:23:21 -07:00
xen	xen: features and fixes for 4.6-rc0	2016-03-22 12:55:17 -07:00
zorro
Kconfig
Makefile