lkml.org 
[lkml]   [2017]   [Feb]   [6]   [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 v4l-dvb tree
On Mon, Feb 06, 2017 at 03:31:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/lirc/lirc_parallel.c
>
> between commit:
>
> 2933974cbb03 ("[media] staging: lirc_parallel: remove")
>
> from the v4l-dvb tree and commit:
>
> 1c5fa1c7dbff ("staging: media: lirc: use new parport device model")
>
> from the staging tree.
>
> Unfortunate ...

That's fine, thanks for letting me know, I didn't realize the file was
removed until after I had applied the patch :(

thanks,

greg k-h

\
 
 \ /
  Last update: 2017-02-06 09:38    [W:0.360 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site