Merge branch 'hfi1-2' into k.o/for-4.7 (8779e765) · Commits · e / devices / android_kernel_teracube_emerald

MAINTAINERS

+7 −6

Original line number	Diff line number	Diff line
		@@ -5086,6 +5086,13 @@ F: drivers/block/cciss*
		F: include/linux/cciss_ioctl.h
		F: include/uapi/linux/cciss_ioctl.h

		HFI1 DRIVER
		M: Mike Marciniszyn <mike.marciniszyn@intel.com>
		M: Dennis Dalessandro <dennis.dalessandro@intel.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		F: drivers/infiniband/hw/hfi1

		HFS FILESYSTEM
		L: linux-fsdevel@vger.kernel.org
		S: Orphan
		@@ -10661,12 +10668,6 @@ M: Arnaud Patard <arnaud.patard@rtp-net.org>
		S: Odd Fixes
		F: drivers/staging/xgifb/

		HFI1 DRIVER
		M: Mike Marciniszyn <infinipath@intel.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		F: drivers/staging/rdma/hfi1

		STARFIRE/DURALAN NETWORK DRIVER
		M: Ion Badulescu <ionut@badula.org>
		S: Odd Fixes

+2 −0

Original line number	Diff line number	Diff line
		@@ -85,4 +85,6 @@ source "drivers/infiniband/ulp/isert/Kconfig"

		source "drivers/infiniband/sw/rdmavt/Kconfig"

		source "drivers/infiniband/hw/hfi1/Kconfig"

		endif # INFINIBAND

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,4 @@ obj-$(CONFIG_MLX5_INFINIBAND) += mlx5/
		obj-$(CONFIG_INFINIBAND_NES) += nes/
		obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/
		obj-$(CONFIG_INFINIBAND_USNIC) += usnic/
		obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		#
		obj-$(CONFIG_INFINIBAND_HFI1) += hfi1.o

		hfi1-y := affinity.o chip.o device.o diag.o driver.o efivar.o \
		hfi1-y := affinity.o chip.o device.o driver.o efivar.o \
		eprom.o file_ops.o firmware.o \
		init.o intr.o mad.o mmu_rb.o pcie.o pio.o pio_copy.o platform.o \
		qp.o qsfp.o rc.o ruc.o sdma.o sysfs.o trace.o twsi.o \