From: Mark Brown <broonie@kernel.org>
To: Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Wed, 2 Dec 2015 13:36:26 +0000 [thread overview]
Message-ID: <20151202133626.c5d9729eb0ffa811fb1ebe8e@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2278 bytes --]
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 a71daaa10ec2e325f ("[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 <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
-#include <mach/udc.h>
-#include <mach/pxa27x-udc.h>
+#include "udc.h"
+#include "pxa27x-udc.h"
- #include <linux/platform_data/camera-pxa.h>
+ #include <linux/platform_data/media/camera-pxa.h>
#include <mach/audio.h>
#include <mach/smemc.h>
#include <media/soc_camera.h>
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 <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/pxa2xx-regs.h>
#include <linux/platform_data/asoc-palm27x.h>
- #include <linux/platform_data/camera-pxa.h>
+ #include <linux/platform_data/media/camera-pxa.h>
-#include <mach/palm27x.h>
+#include "palm27x.h"
#include <sound/pxa2xx-lib.h>
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 <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/keypad-pxa27x.h>
-#include <mach/udc.h>
+#include "udc.h"
#include <linux/platform_data/asoc-palm27x.h>
-#include <mach/palm27x.h>
+#include "palm27x.h"
-#include <mach/pm.h>
+#include "pm.h"
- #include <linux/platform_data/camera-pxa.h>
+ #include <linux/platform_data/media/camera-pxa.h>
#include <media/soc_camera.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Wed, 2 Dec 2015 13:36:26 +0000 [thread overview]
Message-ID: <20151202133626.c5d9729eb0ffa811fb1ebe8e@kernel.org> (raw)
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 a71daaa10ec2e325f ("[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 <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
-#include <mach/udc.h>
-#include <mach/pxa27x-udc.h>
+#include "udc.h"
+#include "pxa27x-udc.h"
- #include <linux/platform_data/camera-pxa.h>
+ #include <linux/platform_data/media/camera-pxa.h>
#include <mach/audio.h>
#include <mach/smemc.h>
#include <media/soc_camera.h>
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 <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/pxa2xx-regs.h>
#include <linux/platform_data/asoc-palm27x.h>
- #include <linux/platform_data/camera-pxa.h>
+ #include <linux/platform_data/media/camera-pxa.h>
-#include <mach/palm27x.h>
+#include "palm27x.h"
#include <sound/pxa2xx-lib.h>
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 <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/keypad-pxa27x.h>
-#include <mach/udc.h>
+#include "udc.h"
#include <linux/platform_data/asoc-palm27x.h>
-#include <mach/palm27x.h>
+#include "palm27x.h"
-#include <mach/pm.h>
+#include "pm.h"
- #include <linux/platform_data/camera-pxa.h>
+ #include <linux/platform_data/media/camera-pxa.h>
#include <media/soc_camera.h>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151202/b60da1fc/attachment.sig>
next reply other threads:[~2015-12-02 13:36 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 13:36 Mark Brown [this message]
2015-12-02 13:36 ` linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2020-12-08 0:04 Stephen Rothwell
2020-12-08 0:04 ` Stephen Rothwell
2020-12-14 20:30 ` Stephen Rothwell
2020-12-14 20:30 ` Stephen Rothwell
2020-12-14 21:05 ` Mauro Carvalho Chehab
2020-12-14 21:05 ` Mauro Carvalho Chehab
2017-08-22 0:55 Stephen Rothwell
2017-08-22 0:55 ` Stephen Rothwell
2017-09-04 5:23 ` Stephen Rothwell
2017-09-04 5:23 ` Stephen Rothwell
2014-12-05 3:03 Stephen Rothwell
2014-12-05 3:03 ` Stephen Rothwell
2014-12-05 3:03 ` Stephen Rothwell
2014-12-01 2:52 Stephen Rothwell
2014-12-01 2:52 ` Stephen Rothwell
2014-12-01 2:52 ` Stephen Rothwell
2014-11-24 2:22 Stephen Rothwell
2014-11-24 2:22 ` Stephen Rothwell
2014-11-24 2:22 ` Stephen Rothwell
2014-11-24 15:28 ` Tony Lindgren
2014-11-24 15:28 ` Tony Lindgren
2012-01-11 2:31 Stephen Rothwell
2012-01-11 2:31 ` Stephen Rothwell
2012-01-11 2:31 ` Stephen Rothwell
2012-01-11 5:08 ` Olof Johansson
2012-01-11 5:08 ` Olof Johansson
2012-01-11 8:36 ` Guennadi Liakhovetski
2012-01-11 8:36 ` Guennadi Liakhovetski
2012-01-11 10:35 ` Mauro Carvalho Chehab
2012-01-11 10:35 ` Mauro Carvalho Chehab
2012-01-11 14:50 ` Arnd Bergmann
2012-01-11 14:50 ` Arnd Bergmann
2012-01-11 15:09 ` Olof Johansson
2012-01-11 15:09 ` Olof Johansson
2012-01-11 15:57 ` Nicolas Ferre
2012-01-11 15:57 ` Nicolas Ferre
2012-01-11 16:44 ` Olof Johansson
2012-01-11 16:44 ` Olof Johansson
2012-01-11 20:47 ` Mauro Carvalho Chehab
2012-01-11 20:47 ` Mauro Carvalho Chehab
2012-01-11 16:46 ` Arnd Bergmann
2012-01-11 16:46 ` Arnd Bergmann
2012-01-11 16:58 ` Olof Johansson
2012-01-11 16:58 ` Olof Johansson
2012-01-11 17:56 ` Guennadi Liakhovetski
2012-01-11 17:56 ` Guennadi Liakhovetski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151202133626.c5d9729eb0ffa811fb1ebe8e@kernel.org \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.