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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Jun 2018 10:31:04 +1000

Hi Miklos,

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

  fs/open.c

between commit:

  af04fadcaa93 ("Revert "fs: fold open_check_o_direct into do_dentry_open"")

from Linus' tree and commit:

  e0e3f7de6435 ("vfs: simplify dentry_open()")

from the overlayfs tree.

I have no idea how to fix this up ... so I just used the overlayfs
version for now.  I assume that this will need more work before being
merged into Linus' tree.

-- 
Cheers,
Stephen Rothwell