From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree Date: Tue, 11 May 2010 20:23:08 -0300 Message-ID: <4BE9E6DC.1030800@infradead.org> References: <20100510103621.4ffbc8c3.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from bombadil.infradead.org ([18.85.46.34]:54446 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751056Ab0EKXXO (ORCPT ); Tue, 11 May 2010 19:23:14 -0400 In-Reply-To: <20100510103621.4ffbc8c3.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Johnson , Yong Zhang 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