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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Sep 2008 13:42:39 +1000

Hi Mauro,

On Mon, 1 Sep 2008 13:14:58 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/radio/dsbr100.c between commit
> 59d1f04f76c8386d468f74c18fe5c008752c9340 ("USB: remove warn() macro from
> usb.h") from the usb tree and commit
> 63057954eb49549963c4c5079381492575cab33a ("V4L/DVB (8778): radio: fix
> incorrect video_register_device result check") from the v4l-dvb tree.
> 
> Just a context clash.  I fixed it up (see below) and can carry the fix.

Of course, this is fixable in the v4l-dvb tree as well.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/