From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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,
Tony Lindgren <tony@atomide.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 17 Sep 2012 19:23:45 +1000 [thread overview]
Message-ID: <20120917192345.10d3b625a5c104183855658f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/omap2/dss/dispc.c between commit fe6a466283cf ("OMAPDSS: remove unnecessary includes") from the omap_dss2 tree and commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal") from the arm-soc 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 drivers/video/omap2/dss/dispc.c
index d512c38,ee9e296..0000000
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@@ -37,6 -37,9 +37,8 @@@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+ #include <plat/cpu.h>
-#include <plat/clock.h>
+
#include <video/omapdss.h>
#include "dss.h"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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,
Tony Lindgren <tony@atomide.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 17 Sep 2012 19:23:45 +1000 [thread overview]
Message-ID: <20120917192345.10d3b625a5c104183855658f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/omap2/dss/dispc.c between commit fe6a466283cf ("OMAPDSS: remove unnecessary includes") from the omap_dss2 tree and commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal") from the arm-soc 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 drivers/video/omap2/dss/dispc.c
index d512c38,ee9e296..0000000
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@@ -37,6 -37,9 +37,8 @@@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+ #include <plat/cpu.h>
-#include <plat/clock.h>
+
#include <video/omapdss.h>
#include "dss.h"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 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 arm-soc tree with the omap_dss2 tree
Date: Mon, 17 Sep 2012 19:23:45 +1000 [thread overview]
Message-ID: <20120917192345.10d3b625a5c104183855658f@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/omap2/dss/dispc.c between commit fe6a466283cf ("OMAPDSS: remove unnecessary includes") from the omap_dss2 tree and commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal") from the arm-soc 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 drivers/video/omap2/dss/dispc.c
index d512c38,ee9e296..0000000
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@@ -37,6 -37,9 +37,8 @@@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+ #include <plat/cpu.h>
-#include <plat/clock.h>
+
#include <video/omapdss.h>
#include "dss.h"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120917/f9c5a41c/attachment.sig>
next reply other threads:[~2012-09-17 9:23 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 9:23 Stephen Rothwell [this message]
2012-09-17 9:23 ` linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Stephen Rothwell
2012-09-17 9:23 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-04-09 7:40 Stephen Rothwell
2013-04-09 7:40 ` Stephen Rothwell
2013-04-09 7:40 ` Stephen Rothwell
2013-04-09 9:32 ` Arnd Bergmann
2013-04-09 9:32 ` Arnd Bergmann
2013-04-09 9:32 ` Arnd Bergmann
2012-12-03 5:52 Stephen Rothwell
2012-12-03 5:52 ` Stephen Rothwell
2012-12-03 5:52 ` Stephen Rothwell
2012-11-30 5:18 Stephen Rothwell
2012-11-30 5:18 ` Stephen Rothwell
2012-11-30 5:18 ` Stephen Rothwell
2012-11-26 10:56 Stephen Rothwell
2012-11-26 10:56 ` Stephen Rothwell
2012-11-26 10:56 ` Stephen Rothwell
2012-11-26 15:53 ` Tony Lindgren
2012-11-26 15:53 ` Tony Lindgren
2012-09-24 9:53 Stephen Rothwell
2012-09-24 9:53 ` Stephen Rothwell
2012-09-24 9:53 ` Stephen Rothwell
2012-09-24 12:43 ` Arnd Bergmann
2012-09-24 12:43 ` Arnd Bergmann
2012-09-24 13:11 ` Tomi Valkeinen
2012-09-24 13:11 ` Tomi Valkeinen
2012-09-24 16:19 ` Tony Lindgren
2012-09-24 16:19 ` Tony Lindgren
2012-05-14 8:51 Stephen Rothwell
2012-05-14 8:51 ` Stephen Rothwell
2012-05-14 8:51 ` Stephen Rothwell
2012-03-13 8:21 Stephen Rothwell
2012-03-13 8:21 ` Stephen Rothwell
2012-03-13 8:21 ` Stephen Rothwell
2012-03-09 7:09 Stephen Rothwell
2012-03-09 7:09 ` Stephen Rothwell
2012-03-09 7:09 ` Stephen Rothwell
2012-03-08 6:00 Stephen Rothwell
2012-03-08 6:00 ` Stephen Rothwell
2012-03-08 6:00 ` Stephen Rothwell
2012-03-08 16:16 ` Arnd Bergmann
2012-03-08 16:16 ` Arnd Bergmann
2012-03-09 9:35 ` Tomi Valkeinen
2012-03-09 9:35 ` Tomi Valkeinen
2012-03-09 11:50 ` Arnd Bergmann
2012-03-09 11:50 ` Arnd Bergmann
2012-03-09 12:14 ` Tomi Valkeinen
2012-03-09 12:14 ` Tomi Valkeinen
2012-03-09 12:26 ` Arnd Bergmann
2012-03-09 12:26 ` Arnd Bergmann
2012-03-09 12:31 ` Tomi Valkeinen
2012-03-09 12:31 ` Tomi Valkeinen
2012-03-08 5:58 Stephen Rothwell
2012-03-08 5:58 ` Stephen Rothwell
2012-03-08 5:58 ` Stephen Rothwell
2012-03-08 5:55 Stephen Rothwell
2012-03-08 5:55 ` Stephen Rothwell
2012-03-08 5:55 ` Stephen Rothwell
2012-03-08 5:51 Stephen Rothwell
2012-03-08 5:51 ` Stephen Rothwell
2012-03-08 5:51 ` Stephen Rothwell
2012-03-10 9:55 ` Janusz Krzysztofik
2012-03-10 9:55 ` Janusz Krzysztofik
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=20120917192345.10d3b625a5c104183855658f@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=olof@lixom.net \
--cc=tomi.valkeinen@ti.com \
--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.