From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Ulf Hansson <ulf.hansson@linaro.org>,
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>
Subject: Re: linux-next: manual merge of the mmc-uh tree with the arm-soc tree
Date: Mon, 10 Nov 2014 09:58:59 +0100 [thread overview]
Message-ID: <54607E53.4060105@atmel.com> (raw)
In-Reply-To: <20141110125637.30fe73b9@canb.auug.org.au>
On 10/11/2014 02:56, Stephen Rothwell :
> Hi Ulf,
>
> Today's linux-next merge of the mmc-uh tree got a conflict in
> arch/arm/mach-at91/at91sam9g45_devices.c between commit 4bf7753b8ab7
> ("ARM: at91: remove at91sam9g45/9m10 legacy board support") from the
> arm-soc tree and commit 4049854c41e0 ("ARM: at91: remove
> mach/atmel-mci.h") from the mmc-uh tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary (no action is required).
Well fixed. Thanks Stephen.
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2014-11-10 8:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 1:56 linux-next: manual merge of the mmc-uh tree with the arm-soc tree Stephen Rothwell
2014-11-10 8:58 ` Nicolas Ferre [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-01 4:22 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=54607E53.4060105@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--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 \
--cc=ulf.hansson@linaro.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).