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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the vfs tree with Linus' tree
Date	2017-03-30 02:10 +0200
Message-ID	<tqvP3-6cP-13@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Al,

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

  drivers/block/nbd.c

between commit:

  9dd5d3ab49f7 ("nbd: handle ERESTARTSYS properly")

from Linus' tree and commit:

  7c09d0a53c27 ("backmerge of nbd.c changes, resolving conflicts")

from the vfs tree.

I fixed it up (I used the former change) 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.

Its probably time that the vfs tree was cleaned up after the last merge
window.
-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the vfs tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-30 02:10 +0200

csiph-web