linux-next: manual merge of the vfs tree with Linus' tree

From: Stephen Rothwell
Date: Tue Nov 28 2017 - 18:53:35 EST

Next message: Sami Tolvanen: "[PATCH 3/3] arm64: use -mno-implicit-float instead of -mgeneral-regs-only"
Previous message: Djalal Harouni: "Re: [kernel-hardening] Re: [PATCH v5 next 5/5] net: modules: use request_module_cap() to load 'netdev-%s' modules"
Next in thread: Stephen Rothwell: "Re: linux-next: manual merge of the vfs tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Next message: Sami Tolvanen: "[PATCH 3/3] arm64: use -mno-implicit-float instead of -mgeneral-regs-only"
Previous message: Djalal Harouni: "Re: [kernel-hardening] Re: [PATCH v5 next 5/5] net: modules: use request_module_cap() to load 'netdev-%s' modules"
Next in thread: Stephen Rothwell: "Re: linux-next: manual merge of the vfs tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]