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 1FC29C433DF for ; Sat, 16 May 2020 17:18:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0C26207CB for ; Sat, 16 May 2020 17:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589649527; bh=v5RTKfeEuKcR+4A+XVmS+Cjs2eERqYGhf+P7cScDTJw=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=owXOxfmOQf3Wo9lDDmQIq85aBeXNIE6IG897pDUe3ch+kAJKFAyIxP8qmLS3ixOhc vuSBJYlMLA4rUoZ+ZJSeJZGAax6wlfNWC3mw+oOXil3n2vCyVcKmvz6oLqYiZyQWJp Kue8cMhrOnvc34EP59ndPFK0z68x8Yvnw//9SgcM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726527AbgEPRSq (ORCPT ); Sat, 16 May 2020 13:18:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:47070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726364AbgEPRSp (ORCPT ); Sat, 16 May 2020 13:18:45 -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 3935420756; Sat, 16 May 2020 17:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589649525; bh=v5RTKfeEuKcR+4A+XVmS+Cjs2eERqYGhf+P7cScDTJw=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=lu0EM76LMrB5odn6AHwGAZiW+tcwmem1e78pPMvBOqE8lBBotijxC12faoK4n/rnn AuFRxlNz3ZwSvOkB42zDn6hpBzfiziHaQD0mUOXWlh3ewqm6aRzgDphdE4X6Krd/dz vWhXW4HASoYYgbHkTMf0XA6o+YU+Sem1G2+aY8Z0= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 1F5723522CED; Sat, 16 May 2020 10:18:45 -0700 (PDT) Date: Sat, 16 May 2020 10:18:45 -0700 From: "Paul E. McKenney" To: Thomas Gleixner Cc: LKML , x86@kernel.org, Andy Lutomirski , Alexandre Chartre , Frederic Weisbecker , Paolo Bonzini , Sean Christopherson , Masami Hiramatsu , Petr Mladek , Steven Rostedt , Joel Fernandes , Boris Ostrovsky , Juergen Gross , Brian Gerst , Mathieu Desnoyers , Josh Poimboeuf , Will Deacon , Tom Lendacky , Wei Liu , Michael Kelley , Jason Chen CJ , Zhao Yakui , "Peter Zijlstra (Intel)" Subject: Re: [patch V6 00/37] x86/entry: Rework leftovers and merge plan Message-ID: <20200516171845.GM2869@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20200515234547.710474468@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200515234547.710474468@linutronix.de> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, May 16, 2020 at 01:45:47AM +0200, Thomas Gleixner wrote: [ . . . ] > - noinstr-rcu-nmi-2020-05-15 > > Based on the core/rcu branch in the tip tree. It has merged in > noinstr-lds-2020-05-15 and contains the nmi_enter/exit() changes along > with the noinstr section changes on top. > > This tag is intended to be pulled by Paul into his rcu/next branch so > he can sort the conflicts and base further work on top. And this sorting process is now allegedly complete and available on the -rcu tree's "dev" branch. As you might have guessed, the major source of conflicts were with Joel's patches, including one conflict that was invisible to "git rebase": 1b2530e7d0c3 ("Revert b8c17e6664c4 ("rcu: Maintain special bits at bottom of ->dynticks counter") 03f31532d0ce ("rcu/tree: Add better tracing for dyntick-idle") a309d5ce2335 ("rcu/tree: Clean up dynticks counter usage") 5c6e734fbaeb ("rcu/tree: Remove dynticks_nmi_nesting counter") This passes modest rcutorture testing. So far, so good! ;-) Thanx, Paul