On Mon, 13 Jan 2014 21:19:46 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: "H. Peter Anvin" <hpa@zytor.com>
> Date: Mon, 13 Jan 2014 20:51:43 -0800
> 
> > Is there a sensible way we can fix this in either net-next or tip?
> 
> I think if I sort the files in net-next the problem will go away,
> if someone can confirm this I'll do it.

I have attached 2 patches: one for net-next and one for tip/auto-latest
(but should be applicable in the appropriate topic branch).  If both are
applied to their respect trees, then I get no conflict when merging the
two trees.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au