On Tue, Mar 13, 2018 at 03:22:40PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got conflicts in:
> between commit:
> 304ec482f562 ("get rid of pointless includes of fs_struct.h")
> from the vfs tree and commits:
> 37d3b407dc14 ("staging: lustre: remove linux-curproc.c")
> 6b7936ceefa7 ("staging: lustre: make signal-blocking functions inline")
> from the staging tree.
> I fixed it up (I just removed the files) and can carry the fix as
Sounds like the correct fix, thanks.