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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 B38A8C433DF for ; Fri, 29 May 2020 23:38:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D0C920897 for ; Fri, 29 May 2020 23:38:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PyNT7Lnn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727876AbgE2XiS (ORCPT ); Fri, 29 May 2020 19:38:18 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:42981 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726898AbgE2XiR (ORCPT ); Fri, 29 May 2020 19:38:17 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49Ygx01cWLz9sRN; Sat, 30 May 2020 09:38:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1590795495; bh=vYXelSLaKYZjwCWrkNAu3O7xZdsEvN6ROiUiIq7h3K8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=PyNT7LnnNbX6oGIKWRPChOoG14JwvWo7sgmBYmUIdI65lYwPVfrueu6dIK+IvKpYi tCybYpuSiLnFVtysVK2x96t62SPQciBl6335b3BhDjaoDnQDUQGCWS/2IW3bmfvKOh kKJPnvOGLY1EOdACp+3hyeztqRrAiEmPUmGP9quNL5FSC90y3fpNGit5jGstcWWRct 2On+EjcnREIC8Bqu4UdJ4p9ICmfArgRBRcWU3A2nO9hFFatvtHi0aPponr4wCilGDO I8o/L3lJqK43B9agPa0J7vKZ0G4FiBkApgnicfXDPltqkyxoMKod5dCz7byzdZSWYr QH9N7LVzo6/sg== Date: Sat, 30 May 2020 09:38:11 +1000 From: Stephen Rothwell To: "Paul E. McKenney" Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List , "Joel Fernandes (Google)" Subject: Re: linux-next: manual merge of the rcu tree with the tip tree Message-ID: <20200530093811.58b1efe2@canb.auug.org.au> In-Reply-To: <20200529141501.GC2869@paulmck-ThinkPad-P72> References: <20200529162234.4f1c3d58@canb.auug.org.au> <20200529164132.6fb46471@canb.auug.org.au> <20200529141501.GC2869@paulmck-ThinkPad-P72> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/3WjDfLIKKMwo7UetuSQFz+n"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/3WjDfLIKKMwo7UetuSQFz+n Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Paul, On Fri, 29 May 2020 07:15:01 -0700 "Paul E. McKenney" = wrote: > > Given that the merge window might be opening in a couple days, my thought > is to defer these -rcu commits to my v5.9 pile, and then I resolve this > conflict in the -rcu tree when v5.8-rc1 comes out. I just now adjusted > the -rcu tree's rcu/next branch accordingly. >=20 > Seem reasonable? Sure, thanks. --=20 Cheers, Stephen Rothwell --Sig_/3WjDfLIKKMwo7UetuSQFz+n Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7RnOMACgkQAVBC80lX 0GygLwf/ZZjoG8koiW9nYM+yUKrV7DB6YZz/yjlf2Acol2KkeKuAtV+21t3qV7TL ER2qODQZNRro5ZSlL8PlCkyY9mL7MnKgnU8tJG/RVXQT6kqFLMRpAeKn3DrYS/yu xyFfnSVeM6T87cJ8cuucjDSNzidfph5n8FJ0EveMDqFlrtnOKC1kP5Z9HFe8CWHA hidzbiiFcST7dpbitVEtBhPFyy9joRbERV9yGIjXGe+6KuJPEvbVZzFyD2S4MVIT xYofFHO6DcxrNG2qOaNJnUfS032nSxEbfS0q6CKHsrVmWiZQ2WHR2a9POYUhDYHq 4EtOiejefGoy6ak6oJR90Xw28EgfPw== =8b73 -----END PGP SIGNATURE----- --Sig_/3WjDfLIKKMwo7UetuSQFz+n--