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

[Stephen Rothwell]

Hi Miklos,

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

  fs/overlayfs/dir.c
  fs/overlayfs/inode.c

I am pretty sure thses conflicts only exist because the overlayfs tree
was rebased before being merged by Linus.  I am dropping the oevrlay fs
tree for today.  Please clean it up.

-- 
Cheers,
Stephen Rothwell