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:
>
> drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
> drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
>
> 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
> necessary.
Sounds like the correct fix, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
