Re: linux-next: manual merge of the trivial tree with the v4l-dvbtree

[Jiri Kosina]

On Wed, 29 Feb 2012, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/s5p-tv/hdmi_drv.c due to commit 382d19f197f9 ("media:
> Fix typo in mixer_drv.c and hdmi_drv.c") from the trivial tree also
> already existing in the v4l-dvb tree (same patch different commit) (and
> there are further changes in that tree to this file).
> 
> I just the used the version from the v4l-dvb tree.

Reverted now in my tree, thanks.

-- 
Jiri Kosina
SUSE Labs
--
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/