From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>,
Anna Schumaker <Anna.Schumaker@Netapp.com>,
Trond Myklebust <trondmy@gmail.com>,
NFS Mailing List <linux-nfs@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Chuck Lever <chuck.lever@oracle.com>,
Kamal Heib <kamalheib1@gmail.com>
Subject: linux-next: manual merge of the rdma tree with the nfs-anna tree
Date: Mon, 24 Dec 2018 14:13:52 +1100 [thread overview]
Message-ID: <20181224141352.461303be@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
net/sunrpc/xprtrdma/fmr_ops.c
between commit:
d31f8deac38d ("xprtrdma: Remove support for FMR memory registration")
from the nfs-anna tree and commit:
3023a1e93656 ("RDMA: Start use ib_device_ops")
from the rdma tree.
I fixed it up (the former removed the file, so I did that) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-12-24 3:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-24 3:13 Stephen Rothwell [this message]
2018-12-30 1:48 ` linux-next: manual merge of the rdma tree with the nfs-anna tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181224141352.461303be@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Anna.Schumaker@Netapp.com \
--cc=chuck.lever@oracle.com \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=kamalheib1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).