Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 'srp' into for-next (44602075) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3425,10 +3425,9 @@ S: Maintained
	F: drivers/net/ipg.*		F: drivers/net/ipg.*

	IPATH DRIVER		IPATH DRIVER
	M: Ralph Campbell <infinipath@qlogic.com>		M: Mike Marciniszyn <infinipath@qlogic.com>
	L: linux-rdma@vger.kernel.org		L: linux-rdma@vger.kernel.org
	T: git git://git.qlogic.com/ipath-linux-2.6		S: Maintained
	S: Supported
	F: drivers/infiniband/hw/ipath/		F: drivers/infiniband/hw/ipath/

	IPMI SUBSYSTEM		IPMI SUBSYSTEM
	@@ -5152,6 +5151,12 @@ M: Robert Jarzmik <robert.jarzmik@free.fr>
	L: rtc-linux@googlegroups.com		L: rtc-linux@googlegroups.com
	S: Maintained		S: Maintained

			QIB DRIVER
			M: Mike Marciniszyn <infinipath@qlogic.com>
			L: linux-rdma@vger.kernel.org
			S: Supported
			F: drivers/infiniband/hw/qib/

	QLOGIC QLA1280 SCSI DRIVER		QLOGIC QLA1280 SCSI DRIVER
	M: Michael Reed <mdr@sgi.com>		M: Michael Reed <mdr@sgi.com>
	L: linux-scsi@vger.kernel.org		L: linux-scsi@vger.kernel.org

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -302,7 +302,8 @@ static void ib_cache_event(struct ib_event_handler *handler,
	event->event == IB_EVENT_LID_CHANGE \|\|		event->event == IB_EVENT_LID_CHANGE \|\|
	event->event == IB_EVENT_PKEY_CHANGE \|\|		event->event == IB_EVENT_PKEY_CHANGE \|\|
	event->event == IB_EVENT_SM_CHANGE \|\|		event->event == IB_EVENT_SM_CHANGE \|\|
	event->event == IB_EVENT_CLIENT_REREGISTER) {		event->event == IB_EVENT_CLIENT_REREGISTER \|\|
			event->event == IB_EVENT_GID_CHANGE) {
	work = kmalloc(sizeof *work, GFP_ATOMIC);		work = kmalloc(sizeof *work, GFP_ATOMIC);
	if (work) {		if (work) {
	INIT_WORK(&work->work, ib_cache_task);		INIT_WORK(&work->work, ib_cache_task);

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -627,6 +627,9 @@ int ib_modify_device(struct ib_device *device,
	int device_modify_mask,		int device_modify_mask,
	struct ib_device_modify *device_modify)		struct ib_device_modify *device_modify)
	{		{
			if (!device->modify_device)
			return -ENOSYS;

	return device->modify_device(device, device_modify_mask,		return device->modify_device(device, device_modify_mask,
	device_modify);		device_modify);
	}		}
	@@ -647,6 +650,9 @@ int ib_modify_port(struct ib_device *device,
	u8 port_num, int port_modify_mask,		u8 port_num, int port_modify_mask,
	struct ib_port_modify *port_modify)		struct ib_port_modify *port_modify)
	{		{
			if (!device->modify_port)
			return -ENOSYS;

	if (port_num < start_port(device) \|\| port_num > end_port(device))		if (port_num < start_port(device) \|\| port_num > end_port(device))
	return -EINVAL;		return -EINVAL;

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -99,14 +99,6 @@ static int c2_query_port(struct ib_device *ibdev,
	return 0;		return 0;
	}		}

	static int c2_modify_port(struct ib_device *ibdev,
	u8 port, int port_modify_mask,
	struct ib_port_modify *props)
	{
	pr_debug("%s:%u\n", __func__, __LINE__);
	return 0;
	}

	static int c2_query_pkey(struct ib_device *ibdev,		static int c2_query_pkey(struct ib_device *ibdev,
	u8 port, u16 index, u16 * pkey)		u8 port, u16 index, u16 * pkey)
	{		{
	@@ -817,7 +809,6 @@ int c2_register_device(struct c2_dev *dev)
	dev->ibdev.dma_device = &dev->pcidev->dev;		dev->ibdev.dma_device = &dev->pcidev->dev;
	dev->ibdev.query_device = c2_query_device;		dev->ibdev.query_device = c2_query_device;
	dev->ibdev.query_port = c2_query_port;		dev->ibdev.query_port = c2_query_port;
	dev->ibdev.modify_port = c2_modify_port;
	dev->ibdev.query_pkey = c2_query_pkey;		dev->ibdev.query_pkey = c2_query_pkey;
	dev->ibdev.query_gid = c2_query_gid;		dev->ibdev.query_gid = c2_query_gid;
	dev->ibdev.alloc_ucontext = c2_alloc_ucontext;		dev->ibdev.alloc_ucontext = c2_alloc_ucontext;

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -61,13 +61,6 @@
	#include "iwch_user.h"		#include "iwch_user.h"
	#include "common.h"		#include "common.h"

	static int iwch_modify_port(struct ib_device *ibdev,
	u8 port, int port_modify_mask,
	struct ib_port_modify *props)
	{
	return -ENOSYS;
	}

	static struct ib_ah iwch_ah_create(struct ib_pd pd,		static struct ib_ah iwch_ah_create(struct ib_pd pd,
	struct ib_ah_attr *ah_attr)		struct ib_ah_attr *ah_attr)
	{		{
	@@ -1392,7 +1385,6 @@ int iwch_register_device(struct iwch_dev *dev)
	dev->ibdev.dma_device = &(dev->rdev.rnic_info.pdev->dev);		dev->ibdev.dma_device = &(dev->rdev.rnic_info.pdev->dev);
	dev->ibdev.query_device = iwch_query_device;		dev->ibdev.query_device = iwch_query_device;
	dev->ibdev.query_port = iwch_query_port;		dev->ibdev.query_port = iwch_query_port;
	dev->ibdev.modify_port = iwch_modify_port;
	dev->ibdev.query_pkey = iwch_query_pkey;		dev->ibdev.query_pkey = iwch_query_pkey;
	dev->ibdev.query_gid = iwch_query_gid;		dev->ibdev.query_gid = iwch_query_gid;
	dev->ibdev.alloc_ucontext = iwch_alloc_ucontext;		dev->ibdev.alloc_ucontext = iwch_alloc_ucontext;