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 8A085C433DF for ; Sat, 23 May 2020 21:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 644D3207FB for ; Sat, 23 May 2020 21:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590269027; bh=FJ+we7Wp4RFWgIBg7miQSN2ilxbswIuR7F8eVxZGfFI=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=XU/eS/BX9i2tgW2nRyW/uNQ5r1SNuTS5cB8CE4llup2KBeOIu88YaXFIcd78l01TP CU623T+3s2PmOPb1VSberw/f9AOa6/pRjIZF7CLultM8guB1eWsK+1g/dkQQV5Xg8O 58sdcMcVrnqCzkutdVVy+ajPEyvn3gDtzRKXwkN4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387998AbgEWVXr (ORCPT ); Sat, 23 May 2020 17:23:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:39178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387586AbgEWVXq (ORCPT ); Sat, 23 May 2020 17:23:46 -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 1D9DF2072C; Sat, 23 May 2020 21:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590269026; bh=FJ+we7Wp4RFWgIBg7miQSN2ilxbswIuR7F8eVxZGfFI=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=yBiF/OlYvCJArLxROuca1TrD8GCNWEhz92e30hI6iQ/+qVjNSZDoqNqAtwAwkD0ck 3vnj3ImHJclxCwe96zKD43kUIfJKRmK8G9en4QyIpO7AJb/lEhV25yrgv8N07B6+xk yZjfCEl/XVnz6ENsyqOvVBCkD8knqmYiyN5UmgZY= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id F1BE23522A2B; Sat, 23 May 2020 14:23:45 -0700 (PDT) Date: Sat, 23 May 2020 14:23:45 -0700 From: "Paul E. McKenney" To: Thomas Gleixner Cc: Borislav Petkov , Stephen Rothwell , Will Deacon , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List , elver@google.com Subject: Re: linux-next: build failure after merge of the tip tree Message-ID: <20200523212345.GR2869@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20200522033119.1bbd99c5@canb.auug.org.au> <20200521173520.GL6608@willie-the-truck> <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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <871rnaqxor.fsf@nanos.tec.linutronix.de> 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 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. Thanx, Paul