From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfram Sang Subject: Re: linux-next: manual merge of the arm-soc tree with the i2c-embedded tree Date: Tue, 10 Jul 2012 10:38:19 +0200 Message-ID: <20120710083819.GA25197@pengutronix.de> References: <20120710164130.f38e4d1673f925ddb13914c9@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yrj/dFKFPuw6o+aM" Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:53793 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753363Ab2GJIia (ORCPT ); Tue, 10 Jul 2012 04:38:30 -0400 Content-Disposition: inline In-Reply-To: <20120710164130.f38e4d1673f925ddb13914c9@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Jones , Alessandro Rubini --yrj/dFKFPuw6o+aM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 10, 2012 at 04:41:30PM +1000, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/i2c/busses/i2c-nomadik.c between commit af97bace2cca > ("i2c-nomadik: move header to ") from > the i2c-embedded tree and commits 32e42c687e0a ("ARM: ux500: Remove > unused i2c platform_data initialisation code") and 8214fd238a66 ("i2c: > Add Device Tree support to the Nomadik I2C driver") from the arm-soc tree. >=20 > I fixed it up (I think - see below) and can carry the fix as necessary. > Please check this and talk to each other ... Hmm, I can't recall any discussion that the DT support patch should go in via arm-soc. Did I miss something? Right now, I'd think it should go in via i2c. I am fine with the other patch going in via arm-soc, but can carry it as well. Regards, Wolfram --=20 Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | --yrj/dFKFPuw6o+aM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAk/76fsACgkQD27XaX1/VRvjmQCgku1NQ2i5RzwCJpUb7OFj0T1Y 8rEAnA26ufeXf40O2y/Wrt597dFNNVbt =Kh7M -----END PGP SIGNATURE----- --yrj/dFKFPuw6o+aM--