lkml.org 
[lkml]   [2017]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with the vfs tree
On Mon, Dec 04, 2017 at 01:06:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/most/video/video.c
>
> between commit:
>
> afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
>
> from the vfs tree and commit:
>
> 1b10a0316e2d ("staging: most: video: remove aim designators")
>
> 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

\
 
 \ /
  Last update: 2017-12-04 10:11    [W:0.021 / U:4.796 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site