From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932236AbbLBNgj (ORCPT ); Wed, 2 Dec 2015 08:36:39 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:57704 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932108AbbLBNgh (ORCPT ); Wed, 2 Dec 2015 08:36:37 -0500 Date: Wed, 2 Dec 2015 13:36:26 +0000 From: Mark Brown To: Mauro Carvalho Chehab , Arnd Bergmann Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Message-Id: <20151202133626.c5d9729eb0ffa811fb1ebe8e@kernel.org> X-Mailer: Sylpheed 3.5.0beta3 (GTK+ 2.24.28; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Wed__2_Dec_2015_13_36_26_+0000_iCp=0bhJ6r6/RPFb" X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@kernel.org Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__2_Dec_2015_13_36_26_+0000_iCp=0bhJ6r6/RPFb Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in arch/arm/mach-pxa/palmz72.c, arch/arm/mach-pxa/palmtreo.c and arch/arm/mach-pxa/mioa701.c between commit 4c25c5d2985c1 ("ARM: pxa: make more mach/*.h files local") from the arm-soc tree and commit a71d= aaa10ec2e325f ("[media] move media platform data to linux/platform_data/media") from the v4l-dvb tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). diff --cc arch/arm/mach-pxa/mioa701.c index a315f6e3c4a6,ccfd2b63c6a4..000000000000 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c @@@ -52,9 -52,9 +52,9 @@@ #include #include #include -#include -#include +#include "udc.h" +#include "pxa27x-udc.h" - #include + #include #include #include #include diff --cc arch/arm/mach-pxa/palmtreo.c index b2aae54bed42,2dc56062fb7e..000000000000 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c @@@ -43,8 -43,8 +43,8 @@@ #include #include #include - #include + #include -#include +#include "palm27x.h" =20 #include =20 diff --cc arch/arm/mach-pxa/palmz72.c index abba86f3e254,e3df17a7e8d4..000000000000 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c @@@ -44,12 -44,12 +44,12 @@@ #include #include #include -#include +#include "udc.h" #include -#include +#include "palm27x.h" =20 -#include +#include "pm.h" - #include + #include =20 #include =20 --Signature=_Wed__2_Dec_2015_13_36_26_+0000_iCp=0bhJ6r6/RPFb Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWXvPaAAoJECTWi3JdVIfQfiYH/13rubXwmraVpY3toTKYEJnX TAlYcICZuHh9vrnZ66p6l1j+DokgsuVtAuGVeaMOY9GfR/Uuhs64Pf6usIIENYnB I2lE+GwQqJdVNirOolTsdkI4xDr1t2AJoqjXHC5doFGyr52gImQ8RoieStt27BlN TDQLkjMjuGq9ZJbZPNgD6tPnHU0QNM/Et+Mht4esgnz2UhOlR4BIjHl+fw3pMOSJ ARp6UFqb+yNAMaRSJCL5vgMayYJj1f1jMTAZGN0tGiZhxsAtzaShdY3k81CfxBFp 7hG0G9BPIfz7VtemljRUlu2jC418nSm/7cOVR0/TAIrUXhnFVfGQPkw1C9PyeW0= =Vqlk -----END PGP SIGNATURE----- --Signature=_Wed__2_Dec_2015_13_36_26_+0000_iCp=0bhJ6r6/RPFb--