On Mon, Dec 19, 2016 at 12:25 AM, Stephen Rothwell <s...@canb.auug.org.au> wrote: > 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.
Hi Stephen, Sorry, fixed now. Thanks, Miklos
