From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbbC3O57 (ORCPT ); Mon, 30 Mar 2015 10:57:59 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:33911 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbbC3O55 (ORCPT ); Mon, 30 Mar 2015 10:57:57 -0400 Message-ID: <5519646C.9010802@mentor.com> Date: Mon, 30 Mar 2015 09:57:48 -0500 From: Nathan Lynch User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Stephen Rothwell CC: Russell King - ARM Linux , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , , Subject: Re: linux-next: build failure after merge of the tip tree References: <20150330171334.6f377ba7@canb.auug.org.au> <20150330071536.GF24899@n2100.arm.linux.org.uk> <20150330190812.5512205f@canb.auug.org.au> In-Reply-To: <20150330190812.5512205f@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.