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

Commit 520a07bf authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6

parents 34abf9ed 68996a6e 5511d781

Documentation/infiniband/sysfs.txt

+2 −1
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ HFI1 
   chip_reset - diagnostic (root only)

   boardversion - board version

   ports/1/

          CMgtA/

          CCMgtA/

               cc_settings_bin - CCA tables used by PSM2

               cc_table_bin

               cc_prescan - enable prescaning for faster BECN response

          sc2v/ - 32 files (0 - 31) used to translate sl->vl

          sl2sc/ - 32 files (0 - 31) used to translate sl->sc

          vl2mtu/ - 16 (0 - 15) files used to determine MTU for vl

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -9085,6 +9085,12 @@ L: rds-devel@oss.oracle.com (moderated for non-subscribers) 
S:	Supported

F:	net/rds/



RDMAVT - RDMA verbs software

M:	Dennis Dalessandro <dennis.dalessandro@intel.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

F:	drivers/infiniband/sw/rdmavt



READ-COPY UPDATE (RCU)

M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

M:	Josh Triplett <josh@joshtriplett.org>

drivers/infiniband/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -83,4 +83,6 @@ source "drivers/infiniband/ulp/srpt/Kconfig" 
source "drivers/infiniband/ulp/iser/Kconfig"

source "drivers/infiniband/ulp/isert/Kconfig"



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



endif # INFINIBAND

drivers/infiniband/Makefile

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

obj-$(CONFIG_INFINIBAND)		+= hw/

obj-$(CONFIG_INFINIBAND)		+= ulp/

obj-$(CONFIG_INFINIBAND)		+= sw/

drivers/infiniband/core/cache.c

+7 −8
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static void ib_cache_update(struct ib_device *device, 


	ret = ib_query_port(device, port, tprops);

	if (ret) {

		printk(KERN_WARNING "ib_query_port failed (%d) for %s\n",

		pr_warn("ib_query_port failed (%d) for %s\n",

			ret, device->name);

		goto err;

	}
@@ -1067,7 +1067,7 @@ static void ib_cache_update(struct ib_device *device, 
	for (i = 0; i < pkey_cache->table_len; ++i) {

		ret = ib_query_pkey(device, port, i, pkey_cache->table + i);

		if (ret) {

			printk(KERN_WARNING "ib_query_pkey failed (%d) for %s (index %d)\n",

			pr_warn("ib_query_pkey failed (%d) for %s (index %d)\n",

				ret, device->name, i);

			goto err;

		}
@@ -1078,7 +1078,7 @@ static void ib_cache_update(struct ib_device *device, 
			ret = ib_query_gid(device, port, i,

					   gid_cache->table + i, NULL);

			if (ret) {

				printk(KERN_WARNING "ib_query_gid failed (%d) for %s (index %d)\n",

				pr_warn("ib_query_gid failed (%d) for %s (index %d)\n",

					ret, device->name, i);

				goto err;

			}
@@ -1161,8 +1161,7 @@ int ib_cache_setup_one(struct ib_device *device) 
					  GFP_KERNEL);

	if (!device->cache.pkey_cache ||

	    !device->cache.lmc_cache) {

		printk(KERN_WARNING "Couldn't allocate cache "

		       "for %s\n", device->name);

		pr_warn("Couldn't allocate cache for %s\n", device->name);

		return -ENOMEM;

	}