From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: linux-next: build failure after merge of the tip tree Date: Mon, 30 Mar 2015 16:08:38 +0100 Message-ID: <20150330150838.GL24899@n2100.arm.linux.org.uk> References: <20150330171334.6f377ba7@canb.auug.org.au> <20150330071536.GF24899@n2100.arm.linux.org.uk> <20150330190812.5512205f@canb.auug.org.au> <5519646C.9010802@mentor.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pandora.arm.linux.org.uk ([78.32.30.218]:52447 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753139AbbC3PJH (ORCPT ); Mon, 30 Mar 2015 11:09:07 -0400 Content-Disposition: inline In-Reply-To: <5519646C.9010802@mentor.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Nathan Lynch Cc: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org 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 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... -- FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.