Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754358AbbB0ABr (ORCPT ); Thu, 26 Feb 2015 19:01:47 -0500 Received: from mail-lb0-f177.google.com ([209.85.217.177]:34481 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754130AbbB0ABq (ORCPT ); Thu, 26 Feb 2015 19:01:46 -0500 MIME-Version: 1.0 In-Reply-To: <1424941761.27971.2.camel@AMDC1943> References: <20150226131413.2aceaf7e@canb.auug.org.au> <1424941761.27971.2.camel@AMDC1943> From: Mike Turquette Date: Thu, 26 Feb 2015 16:01:24 -0800 Message-ID: Subject: Re: linux-next: build failure after merge of the clk tree To: Krzysztof Kozlowski Cc: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stephen Rothwell Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1501 Lines: 44 On Thu, Feb 26, 2015 at 1:09 AM, Krzysztof Kozlowski wrote: > On czw, 2015-02-26 at 13:14 +1100, Stephen Rothwell wrote: >> Hi Mike, >> >> After merging the clk tree, today's linux-next build (x86_64 allmodconfig) >> failed like this: >> >> drivers/clk/clk.c: In function 'clk_disable_unused_subtree': >> drivers/clk/clk.c:514:3: error: label 'out' used but not defined >> goto out; >> ^ >> >> Caused by commit a2146f032294 ("clk: Use lockdep asserts to find >> missing hold of prepare_lock"). Commit c440525cb967 ("clk: Remove >> unneeded NULL checks") removed that label along with the NULL check >> that a2146f032294 reintroduces (was this a bad rebase?). Please do >> simple build tests. >> >> I have used the clk tree from next-20150225 for today. > > Mike, > > It seems that my patch did not applied cleanly and the merge introduced > such artifacts. My patch adds only lockdep_asserts and does not > influence the program flow. I can rebase and resend the patch if you > wish. It's OK. I fixed it up locally the same day that I applied it but didn't push the change out to my mirror in time to catch -next. It will be fixed the next time Stephen pulls the clk tree. Regards, Mike > > Best regards, > Krzysztof > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/