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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the overlayfs tree with Linus' tree
Date	2016-12-19 00:30 +0100
Message-ID	<sPT3Y-8nv-35@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the overlayfs tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-19 00:30 +0100
  Re: linux-next: manual merge of the overlayfs tree with Linus' tree Miklos Szeredi <miklos@szeredi.hu> - 2016-12-19 10:10 +0100

csiph-web