From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: bpf <bpf@vger.kernel.org>,
Network Development <netdev@vger.kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
Kernel Team <Kernel-team@fb.com>
Subject: Re: Keep bpf-next always open
Date: Wed, 23 Sep 2020 15:14:15 -0700 [thread overview]
Message-ID: <20200923221415.jxy6hcpqusodpqsr@ast-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <CAEf4BzbqXHQmwJstrxU3ji5Vrb0XVwp17b7bGjRAy=jCOtaUfQ@mail.gmail.com>
On Wed, Sep 23, 2020 at 02:48:24PM -0700, Andrii Nakryiko wrote:
> On Wed, Sep 23, 2020 at 2:20 PM Alexei Starovoitov
> <alexei.starovoitov@gmail.com> wrote:
> >
> > BPF developers,
> >
> > The merge window is 1.5 weeks away or 2.5 weeks if rc8 happens. In the past we
> > observed a rush of patches to get in before bpf-next closes for the duration of
> > the merge window. Then there is a flood of patches right after bpf-next
> > reopens. Both periods create unnecessary tension for developers and maintainers.
> > In order to mitigate these issues we're planning to keep bpf-next open
> > during upcoming merge window and if this experiment works out we will keep
> > doing it in the future. The problem that bpf-next cannot be fully open, since
> > during the merge window lots of trees get pulled by Linus with inevitable bugs
> > and conflicts. The merge window is the time to fix bugs that got exposed
> > because of merges and because more people test torvalds/linux.git than
> > bpf/bpf-next.git.
> >
> > Hence starting roughly one week before the merge window few risky patches will
> > be applied to the 'next' branch in the bpf-next tree instead of
>
> Riskiness would be up to maintainers to determine or should we mark
> patches with a different tag (bpf-next-next?) explicitly?
"Risky" in a sense of needing a revert. The bpf tree and two plus -rc1 to -rc7
weeks should be enough to address any issues except the most fundamental ones.
Something like the recent bpf_tail_call support in subprograms I would consider
for the "next" branch if it was posted a day before the merge window.
In practice, I suspect, such cases will be rare.
I think bpf-next-next tag should not be used. All features are for [bpf-next].
Fixes are for [bpf]. The bpf-next/next is a temporary parking place for patches
while the merge window is ongoing.
next prev parent reply other threads:[~2020-09-23 22:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 21:19 Keep bpf-next always open Alexei Starovoitov
2020-09-23 21:48 ` Andrii Nakryiko
2020-09-23 22:00 ` Daniel Borkmann
2020-09-23 22:14 ` Alexei Starovoitov [this message]
2020-09-23 22:23 ` Song Liu
2020-09-23 22:28 ` Alexei Starovoitov
2020-09-23 22:37 ` Song Liu
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=20200923221415.jxy6hcpqusodpqsr@ast-mbp.dhcp.thefacebook.com \
--to=alexei.starovoitov@gmail.com \
--cc=Kernel-team@fb.com \
--cc=andrii.nakryiko@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).