Commit cd5e25d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: kbuild infrastructure
  IB/ipath: infiniband verbs support
  IB/ipath: misc infiniband code, part 2
  IB/ipath: misc infiniband code, part 1
  IB/ipath: infiniband RC protocol support
  IB/ipath: infiniband UC and UD protocol support
  IB/ipath: infiniband header files
  IB/ipath: layering interfaces used by higher-level driver code
  IB/ipath: support for userspace apps using core driver
  IB/ipath: sysfs and ipathfs support for core driver
  IB/ipath: misc driver support code
  IB/ipath: chip initialisation code, and diag support
  IB/ipath: support for PCI Express devices
  IB/ipath: support for HyperTransport devices
  IB/ipath: core driver header files
  IB/ipath: core device driver
parents 86dca4f8 77d8798b

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1451,6 +1451,12 @@ P: Juanjo Ciarlante 
M:	jjciarla@raiz.uncu.edu.ar

S:	Maintained



IPATH DRIVER:

P:	Bryan O'Sullivan

M:	support@pathscale.com

L:	openib-general@openib.org

S:	Supported



IPX NETWORK LAYER

P:	Arnaldo Carvalho de Melo

M:	acme@conectiva.com.br

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ 
obj-$(CONFIG_MMC)		+= mmc/

obj-$(CONFIG_NEW_LEDS)		+= leds/

obj-$(CONFIG_INFINIBAND)	+= infiniband/

obj-$(CONFIG_IPATH_CORE)	+= infiniband/

obj-$(CONFIG_SGI_SN)		+= sn/

obj-y				+= firmware/

obj-$(CONFIG_CRYPTO)		+= crypto/

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config INFINIBAND_USER_ACCESS 
	  <http://www.openib.org>.



source "drivers/infiniband/hw/mthca/Kconfig"

source "drivers/infiniband/hw/ipath/Kconfig"



source "drivers/infiniband/ulp/ipoib/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND)		+= core/

obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/

obj-$(CONFIG_IPATH_CORE)		+= hw/ipath/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

drivers/infiniband/hw/ipath/Kconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
config IPATH_CORE

	tristate "PathScale InfiniPath Driver"

	depends on 64BIT && PCI_MSI && NET

	---help---

	This is a low-level driver for PathScale InfiniPath host channel

	adapters (HCAs) based on the HT-400 and PE-800 chips.



config INFINIBAND_IPATH

	tristate "PathScale InfiniPath Verbs Driver"

	depends on IPATH_CORE && INFINIBAND

	---help---

	This is a driver that provides InfiniBand verbs support for

	PathScale InfiniPath host channel adapters (HCAs).  This

	allows these devices to be used with both kernel upper level

	protocols such as IP-over-InfiniBand as well as with userspace

	applications (in conjunction with InfiniBand userspace access).

CRA Git | Maintained and supported by SUSTech CRA and CCSE