Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755498Ab1CBHbv (ORCPT ); Wed, 2 Mar 2011 02:31:51 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:40376 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab1CBHbu (ORCPT ); Wed, 2 Mar 2011 02:31:50 -0500 Date: Wed, 2 Mar 2011 18:31:43 +1100 From: Stephen Rothwell To: David Jander Cc: Samuel Ortiz , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andres Salomon , David Jander , Sascha Hauer , =?UTF-8?B?IlV3ZSAgS2xlaW5lLUvDtm5pZyI=?= Subject: Re: linux-next: manual merge of the mfd tree with the i.MX tree Message-Id: <20110302183143.c52ecc00.sfr@canb.auug.org.au> In-Reply-To: <20110301093528.00184f93@archvile> References: <20110301145436.b1ae1923.sfr@canb.auug.org.au> <20110301093528.00184f93@archvile> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__2_Mar_2011_18_31_43_+1100_WF553KFdv7I=scwV" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2417 Lines: 63 --Signature=_Wed__2_Mar_2011_18_31_43_+1100_WF553KFdv7I=scwV Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi David, On Tue, 1 Mar 2011 09:35:28 +0100 David Jander w= rote: > > Your fix seems correct, although I fear I am too dumb to understand why c= ommit > e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this extra struct > nesting.... AFAICS gcc will end up doing the same as without the extra ne= st. Thanks. > Btw, include/linux/mfd/mc13783.h should end up disappearing after you're = done > merging... I hope so. That file is still included by several others: $ git grep -w mfd/mc13783.h arch/arm/mach-imx/mach-mx27_3ds.c:#include arch/arm/mach-imx/mach-pcm038.c:#include arch/arm/mach-mx3/mach-mx31_3ds.c:#include arch/arm/mach-mx3/mach-mx31lilly.c:#include arch/arm/mach-mx3/mach-mx31lite.c:#include arch/arm/mach-mx3/mach-mx31moboard.c:#include drivers/hwmon/mc13783-adc.c:#include drivers/input/touchscreen/mc13783_ts.c:#include drivers/leds/leds-mc13783.c:#include drivers/mfd/mc13xxx-core.c:#include drivers/regulator/mc13783-regulator.c:#include --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__2_Mar_2011_18_31_43_+1100_WF553KFdv7I=scwV Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBAgAGBQJNbfJfAAoJEDMEi1NhKgbsYI4H/0lPI1+IdZnEkV1U6/X9NfNc TZE3SUmLYsi5P9ow62ffnDLuKiPCOvyiTKsYRzz3sPjLvFXMNzLmln7+VhWWbHi8 waQzObZrXg1n0N8oUMHLH9Dsb8LAlGEqxugbjz/NvVQZBLnAgSccwxg/q0YyLKHy xJBUwX66gO89EO4egwPgvFg+lHxxTXtlFSDf18QoCeDLljpE3tOMssqv8Xnm6InZ dX6WGx+yVLXCr08xK3ns7uDNj99MNrG9dxUFqs5IaXoMrd4ENqHPlJdi8Nuo+w09 aCBz7YCeQRmu2ZrxiAZc6arsdX19F2sMB3PTO09Cr01ktDcwOQ8L0cpm6pN+yjs= =kwl7 -----END PGP SIGNATURE----- --Signature=_Wed__2_Mar_2011_18_31_43_+1100_WF553KFdv7I=scwV-- -- 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/