Hi Linus,

On Mon, 22 Dec 2014 20:09:50 -0800 Linus Torvalds [off-list ref] wrote:

On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell [off-list ref] wrote:

quoted

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 at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141223/5d0da7e0/attachment-0001.sig>