From: Jakub Kicinski <kuba@kernel•org>
To: Luis Chamberlain <mcgrof@kernel•org>
Cc: xiangxia.m.yue@gmail•com, netdev@vger•kernel.org,
Kees Cook <keescook@chromium•org>,
Iurii Zaikin <yzaikin@google•com>,
"David S. Miller" <davem@davemloft•net>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6•org>,
David Ahern <dsahern@kernel•org>,
Simon Horman <horms@verge•net.au>, Julian Anastasov <ja@ssi•bg>,
Pablo Neira Ayuso <pablo@netfilter•org>,
Jozsef Kadlecsik <kadlec@netfilter•org>,
Florian Westphal <fw@strlen•de>,
Dmitry Vyukov <dvyukov@google•com>,
Alexei Starovoitov <ast@kernel•org>,
Eric Dumazet <edumazet@google•com>,
Marc Kleine-Budde <mkl@pengutronix•de>,
Lorenz Bauer <lmb@cloudflare•com>,
Akhmat Karakotov <hmukos@yandex-team•ru>
Subject: Re: [net-next RESEND v2] net: core: use shared sysctl macro
Date: Wed, 6 Apr 2022 14:06:29 -0700 [thread overview]
Message-ID: <20220406140629.7cad841b@kernel.org> (raw)
In-Reply-To: <Yk38ClhCaN5FnuDw@bombadil.infradead.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.
next prev parent reply other threads:[~2022-04-06 21:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-06 12:42 [net-next RESEND v2] net: core: use shared sysctl macro xiangxia.m.yue
2022-04-06 16:20 ` Luis Chamberlain
2022-04-06 19:16 ` Jakub Kicinski
2022-04-06 20:46 ` Luis Chamberlain
2022-04-06 21:06 ` Jakub Kicinski [this message]
2022-04-06 21:17 ` Luis Chamberlain
2022-04-06 19:25 ` Jakub Kicinski
2022-04-07 12:50 ` Alexander Lobakin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220406140629.7cad841b@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@kernel$(echo .)org \
--cc=dvyukov@google$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=hmukos@yandex-team$(echo .)ru \
--cc=horms@verge$(echo .)net.au \
--cc=ja@ssi$(echo .)bg \
--cc=kadlec@netfilter$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=lmb@cloudflare$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=mkl@pengutronix$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
--cc=xiangxia.m.yue@gmail$(echo .)com \
--cc=yoshfuji@linux-ipv6$(echo .)org \
--cc=yzaikin@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox