From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Nicolas Ferre <nicolas.ferre@atmel•com>,
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,
Nicolas Pitre <nicolas.pitre@linaro•org>
Subject: linux-next: manual merge of the at91 tree with the arm-soc tree
Date: Fri, 31 Jul 2015 08:38:03 +1000 [thread overview]
Message-ID: <20150731083803.71c9d466@canb.auug.org.au> (raw)
Hi Nicolas,
Today's linux-next merge of the at91 tree got a conflict in:
arch/arm/mach-at91/sama5.c
between commit:
19c233b79d1a ("ARM: appropriate __init annotation for const data")
from the arm-soc tree and commit:
a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC")
from the at91 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-at91/sama5.c
index 8fc47630bbc8,90c3c3051ae7..000000000000
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@@ -63,7 -65,8 +65,8 @@@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5
.dt_compat = sama5_dt_board_compat,
MACHINE_END
-static const char *sama5_alt_dt_board_compat[] __initconst = {
+static const char *const sama5_alt_dt_board_compat[] __initconst = {
+ "atmel,sama5d2",
"atmel,sama5d4",
NULL
};
next reply other threads:[~2015-07-30 22:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 22:38 Stephen Rothwell [this message]
2015-07-31 7:09 ` linux-next: manual merge of the at91 tree with the arm-soc tree Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2017-06-04 23:48 Stephen Rothwell
2017-04-19 22:38 Stephen Rothwell
2017-04-20 14:50 ` Nicolas.Ferre
2015-05-20 0:08 Stephen Rothwell
2015-05-20 7:41 ` Nicolas Ferre
2011-11-24 1:16 Stephen Rothwell
2011-11-24 9:56 ` Jamie Iles
2011-11-24 10:47 ` Nicolas Ferre
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=20150731083803.71c9d466@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolas.ferre@atmel$(echo .)com \
--cc=nicolas.pitre@linaro$(echo .)org \
--cc=olof@lixom$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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