From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753746AbcESByE (ORCPT ); Wed, 18 May 2016 21:54:04 -0400 Received: from ozlabs.org ([103.22.144.67]:38656 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753491AbcESByB (ORCPT ); Wed, 18 May 2016 21:54:01 -0400 Date: Thu, 19 May 2016 11:53:57 +1000 From: Stephen Rothwell To: Doug Ledford , Trond Myklebust Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Bart Van Assche , Chuck Lever , Anna Schumaker Subject: linux-next: manual merge of the rdma tree with the nfs tree Message-ID: <20160519115357.23f7e19d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/frwr_ops.c between commit: 55fdfce101a0 ("xprtrdma: Rename rpcrdma_frwr::sg and sg_nents") from the nfs tree and commits: ff2ba9936591 ("IB/core: Add passing an offset into the SG to ib_map_mr_sg") 9aa8b3217ed3 ("IB/core: Enhance ib_map_mr_sg()") 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 net/sunrpc/xprtrdma/frwr_ops.c index a192b91ad67e,94c3fa910b85..000000000000 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@@ -450,10 -421,10 +450,10 @@@ frwr_op_map(struct rpcrdma_xprt *r_xprt return -ENOMEM; } - n = ib_map_mr_sg(mr, frmr->fr_sg, frmr->fr_nents, PAGE_SIZE); - n = ib_map_mr_sg(mr, frmr->sg, frmr->sg_nents, NULL, PAGE_SIZE); - if (unlikely(n != frmr->sg_nents)) { ++ n = ib_map_mr_sg(mr, frmr->fr_sg, frmr->fr_nents, NULL, PAGE_SIZE); + if (unlikely(n != frmr->fr_nents)) { pr_err("RPC: %s: failed to map mr %p (%u/%u)\n", - __func__, frmr->fr_mr, n, frmr->sg_nents); + __func__, frmr->fr_mr, n, frmr->fr_nents); rc = n < 0 ? n : -EINVAL; goto out_senderr; }