[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

Hi Linus,

On Mon, 22 Dec 2014 20:09:50 -0800 Linus Torvalds 
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> 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.

Oops, sorry about that.

Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpOg1ivBp3h2.pgp
Description: OpenPGP digital signature

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.