Received: by 2002:a25:d80d:0:0:0:0:0 with SMTP id p13csp222449ybg; Sat, 23 May 2020 12:08:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGUNp7aKz/uIQV6nkp0RwqMLYo5VehOWYVysJ5kecQT51+l7Xs5/EwjOjcZ8/qH4FO74Gi X-Received: by 2002:a17:906:d216:: with SMTP id w22mr424963ejz.420.1590260901170; Sat, 23 May 2020 12:08:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590260901; cv=none; d=google.com; s=arc-20160816; b=GVcpvWEu56+vuVJSGARBnlacaIBopglKEgbAyVVqziw6qFP3ci/gdFV3fEDvRRB8M1 7beX3N4E8j079YRK1c4W46AkHidZNwiX37cH+EUzZfUO5Ch8MNF9Dj6v+Q90WmqjYOm0 /BwNvz5usu7cvnyn7eycoCriyxAyTQ2jubSdGyYIgn4ztWS/rsBDN+BQcZ7BJSD5YH7C PsCvNRZMOhqQU5pI/tArevzB140MLWQCvqduhBOrJM33Mz0ypSpar+UuRnlUL5W2L8JI jKxvMKlQCRds6hQHhxy0AsqZGJCypd0iMhmGF7KgbRozy1f3xaV0nvCP7k8yw/Q7WOrt MLyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from; bh=1xEpQulT062wEPr9ACDIz9J9ELA4PfoWU133rzqRAa4=; b=Cmaze+L+tPsbSZZFfDSnw1MPnUx2FHP80COcgx1ANd0h77BPHHF8IqTofIqEyIkhtt kgJs2kwIZsP06zUfO0rIvFM6Yvx/XzZjVjHMx/ip2njNvGVwKuMW3O1UaM7See/Hh5uB 3EKwHLD+85unJsdYeVnnuL8PmMJc2d8Q4oEWQhEg9ZdMrYfbraWIvu9ak4KN7WjydyM9 IUTko1gHNKnfhGLaxnZP76AFczf8xrHMGyKRp2deddcF/L2pUGiEohBoeVyyvBL9qWzz bBoaaRgWx/7knuYe5AHOLOfu7fdQ0/LVlE/eOF0k3aqnhy21ehjX0wnIuHtTY0VvFtlg 5B8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cb25si6598661edb.142.2020.05.23.12.07.58; Sat, 23 May 2020 12:08:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728509AbgEWTFp (ORCPT + 99 others); Sat, 23 May 2020 15:05:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726790AbgEWTFp (ORCPT ); Sat, 23 May 2020 15:05:45 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61D9DC061A0E; Sat, 23 May 2020 12:05:45 -0700 (PDT) Received: from p5de0bf0b.dip0.t-ipconnect.de ([93.224.191.11] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jcZSa-0004FY-Ti; Sat, 23 May 2020 21:05:29 +0200 Received: by nanos.tec.linutronix.de (Postfix, from userid 1000) id 39EAF100F1A; Sat, 23 May 2020 21:05:24 +0200 (CEST) From: Thomas Gleixner To: paulmck@kernel.org 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 In-Reply-To: <20200523150614.GP2869@paulmck-ThinkPad-P72> 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> Date: Sat, 23 May 2020 21:05:24 +0200 Message-ID: <871rnaqxor.fsf@nanos.tec.linutronix.de> MIME-Version: 1.0 Content-Type: text/plain X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "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 :) Thanks, tglx