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

From: Stephen Rothwell
Date: Sun Jun 03 2018 - 20:31:26 EST

Hi Miklos,

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


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.

Stephen Rothwell

Attachment: pgpEXXbksqNGv.pgp
Description: OpenPGP digital signature