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

Commit e29bff46 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'k.o/for-4.6-rc' into testing/4.6

parents d53e181c e6bd18f5

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -6027,7 +6027,7 @@ F: include/scsi/*iscsi* 




ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR

ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR

M:	Or Gerlitz <ogerlitz@mellanox.com>

M:	Or Gerlitz <ogerlitz@mellanox.com>

M:	Sagi Grimberg <sagig@mellanox.com>

M:	Sagi Grimberg <sagi@grimberg.me>

M:	Roi Dayan <roid@mellanox.com>

M:	Roi Dayan <roid@mellanox.com>

L:	linux-rdma@vger.kernel.org

L:	linux-rdma@vger.kernel.org

S:	Supported

S:	Supported
@@ -6037,7 +6037,7 @@ Q: http://patchwork.kernel.org/project/linux-rdma/list/ 
F:	drivers/infiniband/ulp/iser/

F:	drivers/infiniband/ulp/iser/





ISCSI EXTENSIONS FOR RDMA (ISER) TARGET

ISCSI EXTENSIONS FOR RDMA (ISER) TARGET

M:	Sagi Grimberg <sagig@mellanox.com>

M:	Sagi Grimberg <sagi@grimberg.me>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

L:	linux-rdma@vger.kernel.org

L:	linux-rdma@vger.kernel.org

L:	target-devel@vger.kernel.org

L:	target-devel@vger.kernel.org

drivers/infiniband/core/ucm.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 




#include <asm/uaccess.h>

#include <asm/uaccess.h>





#include <rdma/ib.h>

#include <rdma/ib_cm.h>

#include <rdma/ib_cm.h>

#include <rdma/ib_user_cm.h>

#include <rdma/ib_user_cm.h>

#include <rdma/ib_marshall.h>

#include <rdma/ib_marshall.h>
@@ -1103,6 +1104,9 @@ static ssize_t ib_ucm_write(struct file *filp, const char __user *buf, 
	struct ib_ucm_cmd_hdr hdr;

	struct ib_ucm_cmd_hdr hdr;

	ssize_t result;

	ssize_t result;





	if (WARN_ON_ONCE(!ib_safe_file_access(filp)))

		return -EACCES;



	if (len < sizeof(hdr))

	if (len < sizeof(hdr))

		return -EINVAL;

		return -EINVAL;

drivers/infiniband/core/ucma.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1574,6 +1574,9 @@ static ssize_t ucma_write(struct file *filp, const char __user *buf, 
	struct rdma_ucm_cmd_hdr hdr;

	struct rdma_ucm_cmd_hdr hdr;

	ssize_t ret;

	ssize_t ret;





	if (WARN_ON_ONCE(!ib_safe_file_access(filp)))

		return -EACCES;



	if (len < sizeof(hdr))

	if (len < sizeof(hdr))

		return -EINVAL;

		return -EINVAL;

drivers/infiniband/core/uverbs_main.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,8 @@ 




#include <asm/uaccess.h>

#include <asm/uaccess.h>





#include <rdma/ib.h>



#include "uverbs.h"

#include "uverbs.h"





MODULE_AUTHOR("Roland Dreier");

MODULE_AUTHOR("Roland Dreier");
@@ -709,6 +711,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
	int srcu_key;

	int srcu_key;

	ssize_t ret;

	ssize_t ret;





	if (WARN_ON_ONCE(!ib_safe_file_access(filp)))

		return -EACCES;



	if (count < sizeof hdr)

	if (count < sizeof hdr)

		return -EINVAL;

		return -EINVAL;

drivers/infiniband/core/verbs.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1860,6 +1860,7 @@ EXPORT_SYMBOL(ib_drain_rq); 
void ib_drain_qp(struct ib_qp *qp)

void ib_drain_qp(struct ib_qp *qp)

{

{

	ib_drain_sq(qp);

	ib_drain_sq(qp);

	if (!qp->srq)

		ib_drain_rq(qp);

		ib_drain_rq(qp);

}

}

EXPORT_SYMBOL(ib_drain_qp);
 
EXPORT_SYMBOL(ib_drain_qp);