From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>,
Chris Ball <chris@printf.net>,
Hans-Christian Egtvedt <egtvedt@samfundet.no>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Haavard Skinnemoen <hskinnemoen@gmail.com>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-mmc <linux-mmc@vger.kernel.org>
Subject: Re: [PATCHv2 1/3] mmc: atmel-mci: move mache header to platform_data
Date: Mon, 27 Oct 2014 16:44:19 +0100 [thread overview]
Message-ID: <20141027154419.GE22660@piout.net> (raw)
In-Reply-To: <CAPDyKFr-pyTT=N7p+rU7mnzMg8F_rQOZvDva9GGmwy4J2t3F6Q@mail.gmail.com>
Hi,
On 27/10/2014 at 16:23:23 +0100, Ulf Hansson wrote :
> On 27 October 2014 15:46, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> > On 17 October 2014 10:26, Alexandre Belloni
> > <alexandre.belloni@free-electrons.com> wrote:
> >> Move the mach header that can come either from arm/mach-at91 or avr32 to
> >> platform_data to be able to switch the AT91 platforms to multiplatform.
> >>
> >> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> >
> > Thanks! Applied for next!
>
> Actually this one caused a compiler error due to a moved header from
> the below commit.
>
> 3d598f47e804 dmaengine: dw: move dw_dmac.h to where it belongs to
>
> I decided to fix it myself and fold the change into this patch, see below.
>
what you did seems fine. It was the same commit that conflicted with the
third patch.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2014-10-27 15:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-17 8:26 [PATCHv2 0/3] Remove mach/atmel-mci.h Alexandre Belloni
2014-10-17 8:26 ` [PATCHv2 1/3] mmc: atmel-mci: move mache header to platform_data Alexandre Belloni
2014-10-27 14:46 ` Ulf Hansson
2014-10-27 15:23 ` Ulf Hansson
2014-10-27 15:44 ` Alexandre Belloni [this message]
2014-10-17 8:26 ` [PATCHv2 2/3] ARM: at91: remove mach/atmel-mci.h Alexandre Belloni
2014-10-27 14:47 ` Ulf Hansson
2014-10-17 8:26 ` [PATCHv2 3/3] avr32: " Alexandre Belloni
2014-10-27 14:48 ` Ulf Hansson
2014-10-19 20:15 ` [PATCHv2 0/3] Remove mach/atmel-mci.h Arnd Bergmann
2014-10-20 12:22 ` Ludovic Desroches
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=20141027154419.GE22660@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=chris@printf.net \
--cc=egtvedt@samfundet.no \
--cc=hskinnemoen@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--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