lkml.org 
[lkml]   [2017]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the vfs tree with Linus' tree
Hi Al,

On Wed, 29 Nov 2017 10:53:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got conflicts in several files
> due to commit:
>
> 1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)")
>
> from Linus' tree and commit:
>
> c2c6773f9942 ("VFS: Roll out mount flag differentiation (MS_* -> SB_*) generally")
>
> from the vfs tree.
>
> I just dropped the vfs tree for today, can you please clean it up?

Ping?
--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2017-12-01 00:37    [W:0.041 / U:0.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site