Linux-NFS Archive on lore.kernel.org
 help / Atom feed
* linux-next: manual merge of the rdma tree with the nfs-anna tree
@ 2018-12-24  3:13 Stephen Rothwell
  2018-12-30  1:48 ` Stephen Rothwell
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-12-24  3:13 UTC (permalink / raw)
  To: Doug Ledford, Jason Gunthorpe, Anna Schumaker, Trond Myklebust,
	NFS Mailing List
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chuck Lever,
	Kamal Heib

[-- 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 --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the rdma tree with the nfs-anna tree
  2018-12-24  3:13 linux-next: manual merge of the rdma tree with the nfs-anna tree Stephen Rothwell
@ 2018-12-30  1:48 ` Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2018-12-30  1:48 UTC (permalink / raw)
  To: Anna Schumaker, Trond Myklebust, NFS Mailing List
  Cc: Doug Ledford, Jason Gunthorpe, Linux Next Mailing List,
	Linux Kernel Mailing List, Chuck Lever, Kamal Heib

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

Hi all,

On Mon, 24 Dec 2018 14:13:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.

This is now a conflict between the nfs-anna tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-24  3:13 linux-next: manual merge of the rdma tree with the nfs-anna tree Stephen Rothwell
2018-12-30  1:48 ` Stephen Rothwell

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org linux-nfs@archiver.kernel.org
	public-inbox-index linux-nfs


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/ public-inbox