Re: linux-next: manual merge of the staging tree with the vfs tree

From: Greg KH
Date: Tue May 03 2016 - 14:20:02 EST

On Tue, May 03, 2016 at 04:44:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in:
> drivers/staging/lustre/lustre/llite/rw26.c
> between commit:
> c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
> from the vfs tree and commit:
> 8c7b0e1a6747 ("staging/lustre/llite: rename ccc_object to vvp_object")
> from the staging tree.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good, thanks.

greg k-h