From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754445Ab2IXNLy (ORCPT ); Mon, 24 Sep 2012 09:11:54 -0400 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]:47802 "EHLO na3sys009aog127.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754136Ab2IXNLw (ORCPT ); Mon, 24 Sep 2012 09:11:52 -0400 Message-ID: <1348492306.2361.48.camel@deskari> Subject: Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree From: Tomi Valkeinen To: Arnd Bergmann Cc: Stephen Rothwell , Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Lindgren Date: Mon, 24 Sep 2012 16:11:46 +0300 In-Reply-To: <201209241243.39462.arnd@arndb.de> References: <20120924195305.588277e94ce701abc5e5a6c5@canb.auug.org.au> <201209241243.39462.arnd@arndb.de> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-M+Hqa9IPoUqJ2P+CGqU6" X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-M+Hqa9IPoUqJ2P+CGqU6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Arnd, On Mon, 2012-09-24 at 12:43 +0000, Arnd Bergmann wrote: > On Monday 24 September 2012, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB= 1: > > remove unnecessary includes") from the tree and commit e27e35ec735f > > ("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-s= oc > > tree. > >=20 > > The latter removed a superset of the former (as far as include files is > > concerned), so I used that and can carry the fix as necessary (no actio= n > > is required). > >=20 >=20 > Hi Stephen, >=20 > I looked at all your reports and your fixes are looking good to me. >=20 > I'm already building all ARM defconfigs now and have fixup patches for th= e > instances that went wrong or introduced new warnings, I'll do that again > on top of today's linux-next tree. >=20 > The merge window is going to be fun with all those conflicts, but I don't > have a better idea either. If there's a stable branch for the OMAP platform changes, I could merge it to omapdss tree and fix the conflicts. But if I've understood right, Linus doesn't really like merges just for the sake of fixing conflicts. So far all the omapdss conflicts seem trivial, though. Tomi --=-M+Hqa9IPoUqJ2P+CGqU6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQYFwSAAoJEPo9qoy8lh71EJIQAKtPQwbbQhXVyqxv2aT3j0V+ CJnIpJ2Ohh3DEtq+xfVMg4Q74m4Ux/o0AP8KuYLqoOd9baS6h68iEmq7qHROziH/ TE/E5sk7RyMDLCgGZQv2f0+xSdcG37Uw6941jHd4d1Yeox7JchOOTWzgSZf6K9sj Fq/geFm5Sru9yWkyOfQK8+ber+3mA2LzlHhBlCCTV4aQiWim+19D+xLCiqsuu7Uw dGqR6F+QtALklNVzxJHe6RTOm7iUpPyJSRCqcrikzQk0G4jq29kezXiUUvSyoCwb Bo61T5zwkTc/W4DAGSsYFydSznmwK23JD6oAQSvb0JKuGrjp1POrfHYwTOiVlO9N SoH7Pa1txrVxmIKSui4v4wTy9NIBFjq62JZ8+uriQvmDbLOFHZQ8F+sQFgTBwMvX SCheZHtEqbyNEfXiIMXxGYuUcU+UtygSGVnPHl/zGzwb9+WOKyS6Pg1C2eTXAy/6 HfF9iFGwNyeup22NtZ6jAaiiy/jZd6s4XY+QI69yfHJvgRTBmlGknXY+CprmoDWE yGsD4GCkyBtq43AOrHwc4ufy7q83aL4JQZX4jbRbs4DdYCbw09oA0UhzqS3cShdR GbG6Iprj9rHWHzsZuA93FVRlEGTxrdpNhzoQ8xeNuDWwfcCOV2iZJ4q8CFYS4Xgv fijtLwYSCZlgSy+BwFyF =5H6r -----END PGP SIGNATURE----- --=-M+Hqa9IPoUqJ2P+CGqU6--