Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eba5511 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next

parents ce117ffa 21bfd470 da183c7a 582c016e c94e15c5 22baa407 e8ca4135

Documentation/ABI/stable/sysfs-driver-ib_srp

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ Description: Interface for making ib_srp connect to a new target. 
		  ib_srp. Specifying a value that exceeds cmd_sg_entries is

		  only safe with partial memory descriptor list support enabled

		  (allow_ext_sg=1).

		* comp_vector, a number in the range 0..n-1 specifying the

		  MSI-X completion vector. Some HCA's allocate multiple (n)

		  MSI-X vectors per HCA port. If the IRQ affinity masks of

		  these interrupts have been configured such that each MSI-X

		  interrupt is handled by a different CPU then the comp_vector

		  parameter can be used to spread the SRP completion workload

		  over multiple CPU's.



What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev

Date:		January 2, 2006

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -5365,6 +5365,28 @@ W: http://linuxtv.org 
S:	Odd Fixes

F:	drivers/media/radio/radio-miropcm20*



Mellanox MLX5 core VPI driver

M:	Eli Cohen <eli@mellanox.com>

L:	netdev@vger.kernel.org

L:	linux-rdma@vger.kernel.org

W:	http://www.mellanox.com

Q:	http://patchwork.ozlabs.org/project/netdev/list/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:	git://openfabrics.org/~eli/connect-ib.git

S:	Supported

F:	drivers/net/ethernet/mellanox/mlx5/core/

F:	include/linux/mlx5/



Mellanox MLX5 IB driver

M:      Eli Cohen <eli@mellanox.com>

L:      linux-rdma@vger.kernel.org

W:      http://www.mellanox.com

Q:      http://patchwork.kernel.org/project/linux-rdma/list/

T:      git://openfabrics.org/~eli/connect-ib.git

S:      Supported

F:      include/linux/mlx5/

F:      drivers/infiniband/hw/mlx5/



MODULE SUPPORT

M:	Rusty Russell <rusty@rustcorp.com.au>

S:	Maintained

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ source "drivers/infiniband/hw/amso1100/Kconfig" 
source "drivers/infiniband/hw/cxgb3/Kconfig"

source "drivers/infiniband/hw/cxgb4/Kconfig"

source "drivers/infiniband/hw/mlx4/Kconfig"

source "drivers/infiniband/hw/mlx5/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

source "drivers/infiniband/hw/ocrdma/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_INFINIBAND_AMSO1100) += hw/amso1100/ 
obj-$(CONFIG_INFINIBAND_CXGB3)		+= hw/cxgb3/

obj-$(CONFIG_INFINIBAND_CXGB4)		+= hw/cxgb4/

obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/

obj-$(CONFIG_MLX5_INFINIBAND)		+= hw/mlx5/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= hw/ocrdma/

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

drivers/infiniband/core/sysfs.c

+6 −2
Original line number Diff line number Diff line
@@ -545,8 +545,10 @@ static int add_port(struct ib_device *device, int port_num, 


	p->gid_group.name  = "gids";

	p->gid_group.attrs = alloc_group_attrs(show_port_gid, attr.gid_tbl_len);

	if (!p->gid_group.attrs)

	if (!p->gid_group.attrs) {

		ret = -ENOMEM;

		goto err_remove_pma;

	}



	ret = sysfs_create_group(&p->kobj, &p->gid_group);

	if (ret)
@@ -555,8 +557,10 @@ static int add_port(struct ib_device *device, int port_num, 
	p->pkey_group.name  = "pkeys";

	p->pkey_group.attrs = alloc_group_attrs(show_port_pkey,

						attr.pkey_tbl_len);

	if (!p->pkey_group.attrs)

	if (!p->pkey_group.attrs) {

		ret = -ENOMEM;

		goto err_remove_gid;

	}



	ret = sysfs_create_group(&p->kobj, &p->pkey_group);

	if (ret)