[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree
- To: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
- From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
- Date: Mon, 22 Dec 2014 20:09:50 -0800
- Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, Russell King <linux@xxxxxxxxxxxxxxxx>, Arnd Bergmann <arnd@xxxxxxxx>, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>, Catalin Marinas <Catalin.Marinas@xxxxxxx>, Will Deacon <will.deacon@xxxxxxx>, "linux-kernel@xxxxxxxxxxxxxxx" <linux-kernel@xxxxxxxxxxxxxxx>, "linux-next@xxxxxxxxxxxxxxx" <linux-next@xxxxxxxxxxxxxxx>, David Vrabel <david.vrabel@xxxxxxxxxx>, Olof Johansson <olof@xxxxxxxxx>, "linux-arm-kernel@xxxxxxxxxxxxxxxxxxx" <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>
- Delivery-date: Tue, 23 Dec 2014 04:10:18 +0000
- List-id: Xen developer discussion <xen-devel.lists.xen.org>
On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
Linus
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
