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

From: Mauro Carvalho Chehab <[email-masked]>
Date: Tue, 11 May 2010 20:23:08 -0300

Hi Stephen,

Stephen Rothwell wrote:
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/sn9c20x.c between commit
> a76b9f49ba58d081e373080ff75130673140d3f1 ("V4L/DVB: gspca - sn9c20x:
> Correct onstack wait_queue_head declaration") from Linus' tree and commit
> a0965d58c1aa34ab66f3e2b5abd770f18f393905 ("V4L/DVB: gspca - sn9c20x: use
> gspca's input device handling") from the v4l-dvb tree.
> 
> The latter just removed the code modified by the former.

Conflicts solved. They were generated by an upstream merge from
my fixes tree.

-- 

Cheers,
Mauro