From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>,
"Alexandre Belloni" <alexandre.belloni@free-electrons.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: linux-next: manual merge of the at91 tree with the arm-soc tree
Date: Wed, 20 May 2015 09:41:32 +0200 [thread overview]
Message-ID: <555C3AAC.40101@atmel.com> (raw)
In-Reply-To: <20150520100851.2e485c02@canb.auug.org.au>
Le 20/05/2015 02:08, Stephen Rothwell a écrit :
> Hi Nicolas,
>
> Today's linux-next merge of the at91 tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM:
> multi_v7_defconfig: enable asm and NEON accelerated crypto modules")
> from the arm-soc tree and commit 822cfdfb9511 ("ARM:
> multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix seems perfect: thanks Stephen.
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2015-05-20 7:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 0:08 linux-next: manual merge of the at91 tree with the arm-soc tree Stephen Rothwell
2015-05-20 7:41 ` 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
2015-07-30 22:38 Stephen Rothwell
2015-07-31 7:09 ` 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=555C3AAC.40101@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=ard.biesheuvel@linaro.org \
--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=sfr@canb.auug.org.au \
/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).