From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: Re: linux-next: build failure after merge of the v4l-dvb tree Date: Tue, 15 Jul 2014 21:29:03 -0700 Message-ID: <53C5FF8F.8040402@roeck-us.net> References: <20140715132946.771def89@canb.auug.org.au> <53C4BF8E.4010509@roeck-us.net> <20140715155547.25959587@canb.auug.org.au> <20140715150801.7f8099b1@recife.lan> <20140715190807.GA26057@roeck-us.net> <20140716130434.6b09b2e1@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail.active-venture.com ([67.228.131.205]:56833 "EHLO mail.active-venture.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964822AbaGPE3F (ORCPT ); Wed, 16 Jul 2014 00:29:05 -0400 In-Reply-To: <20140716130434.6b09b2e1@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Mauro Carvalho Chehab , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra On 07/15/2014 08:04 PM, Stephen Rothwell wrote: > Hi Guenter, > > On Tue, 15 Jul 2014 12:08:07 -0700 Guenter Roeck wrote: >> >>>>> Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted >>>>> a week or so ago. >>>> >>>> That is in the tip tree and includes the fixups to powerpc and arm. I >>>> don't merge the tip tree till well after the v4l-dvb tree. The merge >>>> in the v4l-dvb tree included only the change to include/linus/sched.h >>>> and neither parent fo that merge was based on the tip tree ... >>>> >>> Stephen, >>> >>> Do you know if/when this patch will be merged upstream? It doesn't >>> seem to be at 2.6.16-rc5. Otherwise, I'll likely cherry-pick it on >> s/2.16/3.16/ >>> my trees, as the lack of this fixup is making hard for me to check >>> if a media tree patch isn't introducing new warnings. >> >> Only queued for 3.17 as far as I can see, and not scheduled for 3.16. > > Its in the sched/urgent branch of the tip tree, so hopefully it will go > to Linus shortly. > Excellent, glad to hear that I was wrong. Looking forward to it. Thanks, Guenter