Messages in this thread | | | Date | Wed, 29 Nov 2017 10:53:29 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with Linus' tree |
| |
Hi Al,
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?
-- Cheers, Stephen Rothwell
| |