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

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

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

Pull infiniband fixes from Roland Dreier:
 - qib RCU/lockdep fix
 - iser device removal fix, plus doc fixes

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/qib: Fix lockdep splat in qib_alloc_lkey()
  MAINTAINERS: Add entry for iSCSI Extensions for RDMA (iSER) initiator
  IB/iser: Add Mellanox copyright
  IB/iser: Fix device removal flow
parents 5125ed5b c9a2433a

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -4448,6 +4448,16 @@ S: Maintained 
F:	drivers/scsi/*iscsi*

F:	include/scsi/*iscsi*



ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR

M:	Or Gerlitz <ogerlitz@mellanox.com>

M:	Roi Dayan <roid@mellanox.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

W:	http://www.openfabrics.org

W:	www.open-iscsi.org

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

F:	drivers/infiniband/ulp/iser



ISDN SUBSYSTEM

M:	Karsten Keil <isdn@linux-pingi.de>

L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)

drivers/infiniband/hw/qib/qib_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int qib_alloc_lkey(struct qib_mregion *mr, int dma_region) 
	if (dma_region) {

		struct qib_mregion *tmr;



		tmr = rcu_dereference(dev->dma_mr);

		tmr = rcu_access_pointer(dev->dma_mr);

		if (!tmr) {

			qib_get_mr(mr);

			rcu_assign_pointer(dev->dma_mr, mr);

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2004 Alex Aizman

 * Copyright (C) 2005 Mike Christie

 * Copyright (c) 2005, 2006 Voltaire, Inc. All rights reserved.

 * Copyright (c) 2013 Mellanox Technologies. All rights reserved.

 * maintained by openib-general@openib.org

 *

 * This software is available to you under a choice of one of two

drivers/infiniband/ulp/iser/iscsi_iser.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 *

 * Copyright (c) 2004, 2005, 2006 Voltaire, Inc. All rights reserved.

 * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.

 * Copyright (c) 2013 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

drivers/infiniband/ulp/iser/iser_initiator.c

+1 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2004, 2005, 2006 Voltaire, Inc. All rights reserved.

 * Copyright (c) 2013 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU