Re: linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpAh3j0XjB2i.pgp
Description: OpenPGP digital signature