From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sebastian Reichel <sre@kernel.org>,
Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Mon, 1 Dec 2014 13:52:41 +1100 [thread overview]
Message-ID: <20141201135241.435ecb37@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e639cd5bfc03 ("ARM: OMAP2+: Prepare to move GPMC to drivers by platform
data header") from the arm-soc tree and commit 68a3c0433077 ("[media]
ARM: OMAP2: RX-51: update si4713 platform data") from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index e2ad48b5d9c0,ec2e4101988b..000000000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -23,7 -23,7 +23,8 @@@
#include <linux/regulator/machine.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
+ #include <linux/gpio/machine.h>
+#include <linux/omap-gpmc.h>
#include <linux/mmc/host.h>
#include <linux/power/isp1704_charger.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sebastian Reichel <sre@kernel.org>,
Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Mon, 1 Dec 2014 13:52:41 +1100 [thread overview]
Message-ID: <20141201135241.435ecb37@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e639cd5bfc03 ("ARM: OMAP2+: Prepare to move GPMC to drivers by platform
data header") from the arm-soc tree and commit 68a3c0433077 ("[media]
ARM: OMAP2: RX-51: update si4713 platform data") from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index e2ad48b5d9c0,ec2e4101988b..000000000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -23,7 -23,7 +23,8 @@@
#include <linux/regulator/machine.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
+ #include <linux/gpio/machine.h>
+#include <linux/omap-gpmc.h>
#include <linux/mmc/host.h>
#include <linux/power/isp1704_charger.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Mon, 1 Dec 2014 13:52:41 +1100 [thread overview]
Message-ID: <20141201135241.435ecb37@canb.auug.org.au> (raw)
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e639cd5bfc03 ("ARM: OMAP2+: Prepare to move GPMC to drivers by platform
data header") from the arm-soc tree and commit 68a3c0433077 ("[media]
ARM: OMAP2: RX-51: update si4713 platform data") from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index e2ad48b5d9c0,ec2e4101988b..000000000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -23,7 -23,7 +23,8 @@@
#include <linux/regulator/machine.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
+ #include <linux/gpio/machine.h>
+#include <linux/omap-gpmc.h>
#include <linux/mmc/host.h>
#include <linux/power/isp1704_charger.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141201/97d434f4/attachment.sig>
next reply other threads:[~2014-12-01 2:52 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-01 2:52 Stephen Rothwell [this message]
2014-12-01 2:52 ` linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell
2014-12-01 2:52 ` Stephen Rothwell
-- 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
2015-12-02 13:36 Mark Brown
2015-12-02 13:36 ` Mark Brown
2014-12-05 3:03 Stephen Rothwell
2014-12-05 3:03 ` Stephen Rothwell
2014-12-05 3:03 ` 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=20141201135241.435ecb37@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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@infradead.org \
--cc=olof@lixom.net \
--cc=sre@kernel.org \
--cc=tony@atomide.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.