[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20141223173234.7c4c45f5@canb.auug.org.au>
Date: Tue, 23 Dec 2014 17:32:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Will Deacon <will.deacon@....com>,
Jeremy Fitzhardinge <jeremy@...p.org>,
Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
Stefano Stabellini <stefano.stabellini@...citrix.com>,
Xen Devel <Xen-devel@...ts.xensource.com>,
Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
David Vrabel <david.vrabel@...rix.com>,
Catalin Marinas <Catalin.Marinas@....com>,
Russell King <linux@....linux.org.uk>
Subject: Re: linux-next: missing merge fix patch for the merge of the
xen-tip tree with the arm-soc tree
Hi Linus,
On Mon, 22 Dec 2014 20:09:50 -0800 Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
> On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> > Hi Linus,
> >
> > I have been carrying this merge fix patch for some time that is now
> > needed in your tree:
>
> No, it's not. Look more closely.
>
> My merge put the
>
> dev->archdata.dma_coherent = coherent;
>
> line at the top of the function, like the way it was in the original commit.
Oops, sorry about that.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists