From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the at91 tree with the arm-soc tree
Date: Fri, 31 Jul 2015 09:09:16 +0200 [thread overview]
Message-ID: <55BB1F1C.6000501@atmel.com> (raw)
In-Reply-To: <20150731083803.71c9d466@canb.auug.org.au>
Le 31/07/2015 00:38, Stephen Rothwell a ?crit :
> 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).
The merge is correct. Thanks Stephen!
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2015-07-31 7:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 22:38 linux-next: manual merge of the at91 tree with the arm-soc tree Stephen Rothwell
2015-07-31 7:09 ` Nicolas Ferre [this message]
-- 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 at microchip.com
2015-05-20 0:08 Stephen Rothwell
2015-05-20 7:41 ` 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=55BB1F1C.6000501@atmel.com \
--to=nicolas.ferre@atmel.com \
--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).