linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

Hi all,

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

  fs/open.c

between commit:

  7536b2f06724e ("VFS: generate FS_CREATE before FS_OPEN when ->atomic_open used.")

from the vfs-brauner-fixes tree and commit:

  7d1cf5e624ef5 ("vfs: generate FS_CREATE before FS_OPEN when ->atomic_open used.")

from the vfs-brauner 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.

diff --cc fs/open.c
index 58110f0bf5ac8,28f2fcbebb1ba..0000000000000
--- a/fs/open.c
+++ b/fs/open.c

Attachment: signature.asc
Description: PGP signature