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

Greg KH
2017-12-04T09:09:54Z

On Mon, Dec 04, 2017 at 12:58:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/most/cdev/cdev.c
>
> between commit:
>
> afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
>
> from the vfs tree and commit:
>
> 1fd923f38610 ("staging: most: cdev: replace function prefix")
>
> 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.

Fix looks correct to me, thanks.

greg k-h