lkml.org 
[lkml]   [2016]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the overlayfs tree with Linus' tree
On Mon, Dec 19, 2016 at 12:25 AM, Stephen Rothwell <sfr@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

\
 
 \ /
  Last update: 2016-12-19 10:08    [W:0.024 / U:0.452 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site