linux-next: manual merge of the rdma tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1863 bytes --]

Hi all,

Today's linux-next merge of the rdma tree got a conflict in:

  drivers/infiniband/sw/rxe/rxe_comp.c

between commit:

  dc07628bd2bb ("RDMA/rxe: Return CQE error if invalid lkey was supplied")

from Linus' tree and commit:

  c8dcdda046b0 ("RDMA/rxe: Implement invalidate MW operations")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/sw/rxe/rxe_comp.c
index a6712e373eed,207aa7ef52c4..000000000000
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@@ -345,11 -346,9 +346,11 @@@ static inline enum comp_state do_read(s
  
  	ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
  			&wqe->dma, payload_addr(pkt),
- 			payload_size(pkt), to_mr_obj, NULL);
+ 			payload_size(pkt), RXE_TO_MR_OBJ, NULL);
 -	if (ret)
 +	if (ret) {
 +		wqe->status = IB_WC_LOC_PROT_ERR;
  		return COMPST_ERROR;
 +	}
  
  	if (wqe->dma.resid == 0 && (pkt->mask & RXE_END_MASK))
  		return COMPST_COMP_ACK;
@@@ -367,13 -366,11 +368,13 @@@ static inline enum comp_state do_atomic
  
  	ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
  			&wqe->dma, &atomic_orig,
- 			sizeof(u64), to_mr_obj, NULL);
+ 			sizeof(u64), RXE_TO_MR_OBJ, NULL);
 -	if (ret)
 +	if (ret) {
 +		wqe->status = IB_WC_LOC_PROT_ERR;
  		return COMPST_ERROR;
 -	else
 -		return COMPST_COMP_ACK;
 +	}
 +
 +	return COMPST_COMP_ACK;
  }
  
  static void make_send_cqe(struct rxe_qp *qp, struct rxe_send_wqe *wqe,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]