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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4BE9E6DC.1030800@infradead.org>
Date:	Tue, 11 May 2010 20:23:08 -0300
From:	Mauro Carvalho Chehab <mchehab@...radead.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Brian Johnson <brijohn@...il.com>,
	Yong Zhang <yong.zhang0@...il.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/