Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753233Ab1CBHPs (ORCPT ); Wed, 2 Mar 2011 02:15:48 -0500 Received: from protonic.xs4all.nl ([213.84.116.84]:18386 "EHLO protonic.prtnl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750831Ab1CBHPr (ORCPT ); Wed, 2 Mar 2011 02:15:47 -0500 X-Greylist: delayed 1806 seconds by postgrey-1.27 at vger.kernel.org; Wed, 02 Mar 2011 02:15:46 EST Message-ID: <37329.84.56.74.117.1299048219.squirrel@protonic.xs4all.nl> In-Reply-To: <20110301113930.4743a13c@debxo> References: <20110301145436.b1ae1923.sfr@canb.auug.org.au> <20110301093528.00184f93@archvile> <20110301113930.4743a13c@debxo> Date: Wed, 2 Mar 2011 07:43:39 +0100 (CET) Subject: Re: linux-next: manual merge of the mfd tree with the i.MX tree From: david@protonic.nl To: "Andres Salomon" Cc: "David Jander" , "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?= User-Agent: SquirrelMail/1.4.10a MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Priority: 3 (Normal) Importance: Normal Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1500 Lines: 42 > 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/ Ah, ok. I thought this change was somehow necessary for your patch to work. I would have expected a separate patch otherwise. Best regards, -- David Jander -- 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/