From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 807D0C433E0 for ; Mon, 25 May 2020 16:13:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 592E92073B for ; Mon, 25 May 2020 16:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590423223; bh=jiZiG0bor02kpE35BPuQQ3h8r6eEvC1hLuIUNVg03kk=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=Uf3QAjYnVLeteStO8n20hVjUSRfplgnsDbOgyXIA2seNZpFc/CTt8BpLqw93ZbWkf Tem/LabqiChnmk/Scr6Gtakd/QTlsDnwQ4dR3KBbNczqt7pzoOvR5iHNuK7Rdh7mVh tOXIMxebWCRFoSRZetvJDyEWpWULvQ3y1T4wVZKQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389191AbgEYQNn (ORCPT ); Mon, 25 May 2020 12:13:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:60930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391223AbgEYQNm (ORCPT ); Mon, 25 May 2020 12:13:42 -0400 Received: from paulmck-ThinkPad-P72.home (50-39-105-78.bvtn.or.frontiernet.net [50.39.105.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2FBA82071A; Mon, 25 May 2020 16:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590423222; bh=jiZiG0bor02kpE35BPuQQ3h8r6eEvC1hLuIUNVg03kk=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=KCkxdrwJOY8nW6Wagc7h7jekGDCj0PmCMjLMyDqM5r6wv6jO52Y92ujMsalAY1QUw Ai2SN/dFBQWGQkKW21uPSuLMemM5B0Y0pwh0o9eWn9+7KUZAR5g3K2T4tqI7U9Ityp E2ucNhVhRk/ce9i2tYenJWduJQz6u5Bhdj5603wc= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 17583352267B; Mon, 25 May 2020 09:13:42 -0700 (PDT) Date: Mon, 25 May 2020 09:13:42 -0700 From: "Paul E. McKenney" To: Marco Elver Cc: Thomas Gleixner , Borislav Petkov , Stephen Rothwell , Will Deacon , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: build failure after merge of the tip tree Message-ID: <20200525161342.GY2869@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20200522171708.5f392fde@canb.auug.org.au> <20200522174944.1a1732fa@canb.auug.org.au> <20200523001223.GA23921@paulmck-ThinkPad-P72> <20200523064643.GA27431@zn.tnic> <87a71zq8ml.fsf@nanos.tec.linutronix.de> <20200523150614.GP2869@paulmck-ThinkPad-P72> <871rnaqxor.fsf@nanos.tec.linutronix.de> <20200523212345.GR2869@paulmck-ThinkPad-P72> <20200525003706.GA13789@paulmck-ThinkPad-P72> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, May 25, 2020 at 10:20:29AM +0200, Marco Elver wrote: > On Mon, 25 May 2020 at 02:37, Paul E. McKenney wrote: > > > > On Sat, May 23, 2020 at 02:23:45PM -0700, Paul E. McKenney wrote: > > > On Sat, May 23, 2020 at 09:05:24PM +0200, Thomas Gleixner wrote: > > > > "Paul E. McKenney" writes: > > > > > On Sat, May 23, 2020 at 11:54:26AM +0200, Thomas Gleixner wrote: > > > > >> core/rcu is the one which diverged and caused the merge conflict with > > > > >> PPC to happen twice. So Paul needs to remove the stale core/rcu bits and > > > > >> rebase on the current version (which is not going to change again). > > > > > > > > > > So there will be another noinstr-rcu-* tag, and I will rebase on top > > > > > of that, correct? If so, fair enough! > > > > > > > > Here you go: noinstr-rcu-220-05-23 > > > > > > > > I wanted this to be 2020 and not 220 but I noticed after pushing it > > > > out. I guess it still does the job :) > > > > > > Now -that- is what I call an old-school tag name!!! ;-) > > > > > > I remerged, rebased, and pushed to -rcu branch "dev". > > > > > > If it survives testing, I will reset -rcu branch "rcu/next" as well. > > > > And passed! The compile times are back to their old selves on my > > laptop as well. > > > > Thank you for setting this up, Thomas!!! > > I just noticed that -rcu and -tip both still have their own version of > "ubsan, kcsan: Don't combine sanitizer with kcov on clang". For there > to not be any conflicts in -next, "ubsan, kcsan: Don't combine > sanitizer with kcov on clang" could be dropped from -rcu. Thank you for spotting this! Yes, if it is already in -tip, I should drop it. If this causes trouble for clang users working with -rcu, I can always pull in the exact commit used in -tip. Anyway, -rcu branch "dev" no longer contains this commit. Thanx, Paul