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: Fri, 09 Apr 2010 02:22:29 -0300 Message-ID: <4BBEB995.4090307@infradead.org> References: <20100407110035.217b024b.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from bombadil.infradead.org ([18.85.46.34]:39477 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753104Ab0DIFWg (ORCPT ); Fri, 9 Apr 2010 01:22:36 -0400 In-Reply-To: <20100407110035.217b024b.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, Tejun Heo , Hans Verkuil Hi Stephen, Stephen Rothwell wrote: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got a conflict in > drivers/media/video/meye.c between commit > 5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h > and slab.h includes to prepare for breaking implicit slab.h inclusion > from percpu.h") from Linus' tree and commit > b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last > V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree. > > Just context changes. I fixed it up (see below) and can carry the change > for a while. Thanks for pointing it to me. Fixed. I also fixed today a conflict that it would appear on your next pull, between input and v4l-dvb, due to the upstream changes of keytable ops from int to unsigned. -- Cheers, Mauro