From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Wed, 23 Jan 2013 16:30:36 +1100 [thread overview]
Message-ID: <20130123163036.4791935db9e9539c4313c97f@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/platsmp.c between commit 520f7bd73354 ("irqchip: Move
ARM gic.h to include/linux/irqchip/arm-gic.h") from the arm-soc tree and
commit 4c6e1ff5b5fe ("ARM: tegra: move tegra_cpu_car.h to
linux/clk/tegra.h") from the tegra 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-tegra/platsmp.c
index 18d7290,3ec7fc4..0000000
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@@ -18,11 -18,13 +18,13 @@@
#include <linux/jiffies.h>
#include <linux/smp.h>
#include <linux/io.h>
+#include <linux/irqchip/arm-gic.h>
+ #include <linux/clk/tegra.h>
#include <asm/cacheflush.h>
-#include <asm/hardware/gic.h>
#include <asm/mach-types.h>
#include <asm/smp_scu.h>
+ #include <asm/smp_plat.h>
#include <mach/powergate.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/20130123/e1eae94b/attachment.sig>
next reply other threads:[~2013-01-23 5:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 5:30 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-19 23:04 linux-next: manual merge of the tegra tree with the arm-soc tree Stephen Rothwell
2020-03-26 22:27 Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:50 ` Arnd Bergmann
2019-06-25 0:12 Stephen Rothwell
2015-12-02 11:46 Mark Brown
2013-03-18 4:31 Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49 ` Arnd Bergmann
2013-01-23 5:25 Stephen Rothwell
2013-01-16 3:14 Stephen Rothwell
2013-01-16 3:49 ` Tony Prisk
2013-01-16 4:32 ` Stephen Warren
2013-01-16 4:52 ` Tony Prisk
2013-01-16 16:27 ` Olof Johansson
2013-01-16 17:08 ` Stephen Warren
2013-01-16 17:35 ` Olof Johansson
2013-01-16 3:10 Stephen Rothwell
2013-01-16 3:12 ` Stephen Rothwell
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=20130123163036.4791935db9e9539c4313c97f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).