lkml.org 
[lkml]   [2016]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the overlayfs tree with Linus' tree
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

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