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

From: Stephen Rothwell
Date: Sun May 01 2016 - 20:43:35 EST

Hi Al,

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


between commit:

09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")

from Linus' tree and commits:

ce23e6401334 ("->getxattr(): pass dentry and inode as separate arguments")
7d2dbb9faf05 ("fixups for PAGE_CACHE_SIZE/page_cache_release-induced conflicts")

from the vfs tree.

I fixed it up (the latter vfs tree patch repeated the relevant parts of
the patch in Linus' tree, so I just used the vfs tree version) 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.

Stephen Rothwell