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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C82F9C4332F for ; Wed, 6 Apr 2022 21:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236483AbiDFVjw (ORCPT ); Wed, 6 Apr 2022 17:39:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238085AbiDFViw (ORCPT ); Wed, 6 Apr 2022 17:38:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92122DE7 for ; Wed, 6 Apr 2022 14:06:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CE8ADB824E1 for ; Wed, 6 Apr 2022 21:06:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4597C385A1; Wed, 6 Apr 2022 21:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649279191; bh=XHOhwkDIIzp0VA+nTmVzZn0qZHv0E9t9rp51E4K6LA0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=I5bOZb/ZZ52DG8xu6AClu+5+h9RQDDOgFN1RdnhPUC1dD3alMgKLTbrP2Y9lVxuPN Wh9DdsWmF3DrkHAZrSRDUEvk4icvcjNMZicJo54L+lRaNASqXtHOQzZUdJH+FaC+qZ sYNX5ENbNRrhywcL2ZprL8Jq6ERVClPsHAf47Z5RJm9QVaZpk0pjLK9XzuturlyjqL wLxK1UW9e3/TysAEeUpHjGKuRrLbdPvWdqRrz3BF6OfwEdMzbuwPVRtA+U8jbacian 66pLuBbjjHkaMxSeEoSj1o/qtZtO/x5PWFQwkgI9Skso30d0GMRV75ft3sAKBUZjct tWXLSStXqoISQ== Date: Wed, 6 Apr 2022 14:06:29 -0700 From: Jakub Kicinski To: Luis Chamberlain Cc: xiangxia.m.yue@gmail.com, netdev@vger.kernel.org, Kees Cook , Iurii Zaikin , "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , Dmitry Vyukov , Alexei Starovoitov , Eric Dumazet , Marc Kleine-Budde , Lorenz Bauer , Akhmat Karakotov Subject: Re: [net-next RESEND v2] net: core: use shared sysctl macro Message-ID: <20220406140629.7cad841b@kernel.org> In-Reply-To: References: <20220406124208.3485-1-xiangxia.m.yue@gmail.com> <20220406121611.1791499d@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, 6 Apr 2022 13:46:02 -0700 Luis Chamberlain wrote: > > sysctl-next makes a lot of sense, but I'm worried about conflicts. > > I can try to deal with them as I can send the pull request to Linus towards > the end of the merge window. Do you mean that your -next branch is unstable and can be rebased? Often people keep their -next branches stable, and then only Linus can deal with the conflict (with linux-next's help). > > Would you be able to spin up a stable branch based on -rc1 so we > > can pull it into net-next as well? > > Yes, absolutely. Just pushed, but I should note that linux-next already > takes in sysctl-next. And there are non-networking changes that are > in sysctl-next. What I mean by a stable branch is a separate branch on top of -rc1 with just this patch/series, which we can pull into net-next and you can pull into sysctl-next. That way this change will appear with the same commit id in both trees and git will deal with it smoothly. > Does net-next go to Linus or is it just to help with > developers so they get something more close to linux-next but not as > insane? net-next goes to Linus and it's "stable" by which I mean no rebasing or hard pushing.