Re: linux-next: manual merge of the vfs tree with the xfs tree
From: Dave Chinner
Date: Tue Oct 30 2018 - 21:12:47 EST
On Wed, Oct 31, 2018 at 11:52:47AM +1100, Stephen Rothwell wrote:
> Hi all,
> [I don't understand why all this new work turned up in the xfs tree
> during the merge window ...]
> Today's linux-next merge of the vfs tree got a conflict in:
> between commits:
> 42ec3d4c0218 ("vfs: make remap_file_range functions take and return bytes completed")
> eca3654e3cc7 ("vfs: enable remap callers that can handle short operations")
> from the xfs tree and commit:
> 5de4480ae7f8 ("vfs: allow dedupe of user owned read-only files")
> from the vfs 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.
Looks ok. I didn't expect this conflict, but looks simple enough
to resolve. Thanks!