linux-kernel - Re: [PATCHv2 1/3] mmc: atmel-mci: move mache header to platform

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20141027154419.GE22660@piout.net>
Date:	Mon, 27 Oct 2014 16:44:19 +0100
From:	Alexandre Belloni <alexandre.belloni@...e-electrons.com>
To:	Ulf Hansson <ulf.hansson@...aro.org>
Cc:	Nicolas Ferre <nicolas.ferre@...el.com>,
	Chris Ball <chris@...ntf.net>,
	Hans-Christian Egtvedt <egtvedt@...fundet.no>,
	Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>,
	Haavard Skinnemoen <hskinnemoen@...il.com>,
	Ludovic Desroches <ludovic.desroches@...el.com>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	linux-mmc <linux-mmc@...r.kernel.org>
Subject: Re: [PATCHv2 1/3] mmc: atmel-mci: move mache header to platform_data

Hi,

On 27/10/2014 at 16:23:23 +0100, Ulf Hansson wrote :
> On 27 October 2014 15:46, Ulf Hansson <ulf.hansson@...aro.org> wrote:
> > On 17 October 2014 10:26, Alexandre Belloni
> > <alexandre.belloni@...e-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@...e-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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/