Subject: Re: linux-next: build failure after merge of the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Jun 2012 20:26:04 +1000

Hi all,

On Wed, 20 Jun 2012 01:20:37 -0700 (PDT) David Miller <[email-masked]> wrote:
>
> From: viresh kumar <[email-masked]>
> Date: Wed, 20 Jun 2012 09:08:34 +0100
> 
> > Please see following patchset from me, that got applied in linux-next
> > 
> > https://lkml.org/lkml/2012/4/24/154
> > 
> > Please check if this patchset is present in your build repo. I believe it should be
> > there. If it is, then you shouldn't get these errors.
> 
> Well, then Stephen shouldn't get those errors either.
> 
> But obviously he did.
> 
> But all of this talk about changes existing only in linux-next is
> entirely moot.  Because The damn thing MUST build independently inside
> of net-next which doesn't have those clock layer changes.
> 
> Someone send me a clean fix for net-next now.

I get those errors because those patches are in the akpm tree which is
merged after everything else ...

One possibility is to put those changes in another (stable) tree and
merge that into the net-next tree (and any other tree that needs it).
-- 
Cheers,
Stephen Rothwell                    [email-masked]