[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20150414093454.7a22ea9a@canb.auug.org.au>
Date: Tue, 14 Apr 2015 09:34:54 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Russell King - ARM Linux <linux@....linux.org.uk>
Cc: Nathan Lynch <Nathan_Lynch@...tor.com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the tip tree
Hi Russell,
On Mon, 30 Mar 2015 16:08:38 +0100 Russell King - ARM Linux <linux@....linux.org.uk> wrote:
>
> On Mon, Mar 30, 2015 at 09:57:48AM -0500, Nathan Lynch wrote:
> > On 03/30/2015 03:08 AM, Stephen Rothwell wrote:
> > > Hi Russell,
> > >
> > > On Mon, 30 Mar 2015 08:15:37 +0100 Russell King - ARM Linux <linux@....linux.org.uk> wrote:
> > >>
> > >> I'll drop the VDSO stuff from the ARM tree; I can't see a way to keep
> > >> it in my tree and keep my tree buildable without dragging in the tip
> > >> tree.
> > >
> > > Does it affect your tree on its own? If not, then it can be fixed when
> > > merged as I have done, or if you look at the tip tree, all you really
> > > need to merge is tip timers/core branch (which I am sure the tip guys
> > > can tell you if it is stable enough) which is about 28 commits ...
> > >
> > >> The ARM VDSO stuff will just have to wait for 4.2 instead.
> > >
> > > If that works for you.
> >
> > FWIW, Stephen's merge fix is correct and I have run my vdso tests
> > without problems on OMAP5 with next-20150330.
>
> Hopefully, I can pull the tip stuff but if not, I'll try to remember
> to include Stephen's patch with my pull request, but I can't make any
> guarantees - Stephen's email will very quickly get buried in my mailbox,
> and I'll most likely forget about it too... I'm notoriously bad with
> email...
This patch is now needed when the arm tree is merged with Linus' tree
(the tip tree part has been merged).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists