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

[Greg KH]

On Wed, Nov 05, 2014 at 03:29:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/media/lirc/lirc_imon.c between commit f3a75505ab5f
> ("[media] Staging: media: lirc: cleaned up packet dump in 2 files")
> from the v4l-dvb tree and commit 732ba199ab07 ("staging: media: lirc:
> lirc_imon.c: replace printk by dev_dbg") from the staging tree.
> 
> I fixed it up (the staging tree patch was not complete, so I did the
> below) and can carry the fix as necessary (no action is required).

Thanks for all 3 of these, they look fine.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/