[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    Re: linux-next: manual merge of the vfs tree with Linus' tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2017-11-30 23:36:02
Message-ID: 20171201103602.1b83eec7 () canb ! auug ! org ! au
[Download RAW message or body]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]