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

[Jiri Kosina]

On Tue, 28 Dec 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/zoran/zoran.h between commit
> 8221f9b5fa3e08ba35378f08f2a606156e685916 ("[media] zoran: remove V4L1
> compat code and zoran custom ioctls") from the v4l-dvb tree and commit
> b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
> typos") from the trivial tree.
> 
> The former removed the code modified by the latter, so I used the former.

On Tue, 28 Dec 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/staging/stradis/stradis.c between commit
> aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
> deprecated V4L1 drivers") from the v4l-dvb tree and commit
> b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
> typos") from the trivial tree.
> 
> The former removed the file modified by the latter, so I removed the file.

Hi Stephen,

I have dropped both hunks, so the conflict should be gone now.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/