Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757334Ab1CATji (ORCPT ); Tue, 1 Mar 2011 14:39:38 -0500 Received: from LUNGE.MIT.EDU ([18.54.1.69]:48124 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757324Ab1CATje (ORCPT ); Tue, 1 Mar 2011 14:39:34 -0500 Date: Tue, 1 Mar 2011 11:39:30 -0800 From: Andres Salomon To: David Jander Cc: Stephen Rothwell , Samuel Ortiz , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Jander , Sascha Hauer , "Uwe =?ISO-8859-1?Q?Kleine-K=F6nig?=" Subject: Re: linux-next: manual merge of the mfd tree with the i.MX tree Message-ID: <20110301113930.4743a13c@debxo> In-Reply-To: <20110301093528.00184f93@archvile> References: <20110301145436.b1ae1923.sfr@canb.auug.org.au> <20110301093528.00184f93@archvile> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1312 Lines: 33 On Tue, 1 Mar 2011 09:35:28 +0100 David Jander wrote: > > Hi Stephen, > > On Tue, 1 Mar 2011 14:54:36 +1100 > Stephen Rothwell wrote: > > Today's linux-next merge of the mfd tree got a conflict in > > arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c > > arch/arm/mach-mx3/mach-mx31_3ds.c > > arch/arm/mach-mx3/mach-mx31moboard.c between commit > > 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 ("ARM: imx+mx3: convert to > > mc13xxx MFD") from the i.MX tree and commit > > e84e545d47d26644275a79fe5ebc1797bcb80910 ("mfd: mfd_cell is now > > implicitly available to mc13xxx drivers") from the mfd tree. > > > > I fixed it up (I think - see below) and can carry the fix as > > necessary. > > Your fix seems correct, although I fear I am too dumb to understand > why commit e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this > extra struct nesting.... AFAICS gcc will end up doing the same as > without the extra nest. It was requested in this thread: https://patchwork.kernel.org/patch/551441/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/