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

[Greg KH]

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