mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Jakub Kicinski <kuba@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>,
	 Paolo Abeni <pabeni@redhat.com>,
	Andrew Halaney <andrew@amutable.com>,
	 Kuniyuki Iwashima <kuniyu@google.com>,
	Oleg Nesterov <oleg@redhat.com>,
	 "David S. Miller" <davem@davemloft.net>,
	Simon Horman <horms@kernel.org>,
	 Willem de Bruijn <willemb@google.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Alexander Viro <viro@zeniv.linux.org.uk>,
	Jan Kara <jack@suse.cz>,
	linux-fsdevel@vger.kernel.org,
	 Alexander Mikhalitsyn <alexander@mihalicyn.com>,
	Eric Dumazet <edumazet@kernel.org>,
	broonie@kernel.org
Subject: Re: [PATCH v4 00/10] net: support thread-specific pidfds for send and connect
Date: Tue, 20 Oct 2026 19:39:20 +0000	[thread overview]
Message-ID: <atfAmtsj0LmZtBZs@meerkat.local> (raw)
In-Reply-To: <20261016085732.2f1ffb8a@kernel.org>

On Fri, Oct 16, 2026 at 08:57:32AM -0700, Jakub Kicinski wrote:
> Konstantin, could you consider adding a b4 option which would
> make it apply the patches on the most recent Linus release tag
> and then merge them into current branch as normal?
> Simpler version is to let the user name the application base.
> This lets other trees trivially create a branch later if they
> want to.

This was a fairly frequent request, so I made this change now:

    b4 shazam -M <msgid>

applies the series on the nearest annotated tag in the history of your current
branch (e.g. v7.3-rc6), and then merges it into your branch with the cover
letter as the merge message, just like a pull request. If the series doesn't
apply cleanly on that tag, or there is no annotated tag, b4 falls back to
applying on HEAD and tells you why.

As previously, use -H instead of -M if you just want the result in FETCH_HEAD
so you can look at it first.

If you don't want to upgrade to current master, you can already use
--merge-base to achieve the same effect:

    b4 shazam -M --merge-base v7.3-rc6 <msgid>

It takes any commit, branch, or tag. The most recent master also takes a few
new markers: _tag (the nearest annotated tag, with no fallback to HEAD),
_specified (the series' own base-commit, which is what -M used before), and
_guess (guess from the blob hashes in the patches).

The breaking change here is that b4 no longer uses the series' base-commit by
default -- it was always envisioned as more of a hint for the CI systems. As
far as I'm aware, almost every real maintainer wants to apply to HEAD or, at
least, to the most recent tag as the base.

One potential pitfall: b4 can't know if "the nearest ancestor annotated tag"
is actually useful or meaningful, so if your own annotated pull request tags
(e.g. net-7.3-rc7) are in the history of your branch, one of those could end
up being the nearest tag. b4 always prints which tag it picked, so if you see
that, just pass --merge-base with the release tag you wanted.

The same logic now is in the "b4 review" TUI when taking a series with the
merge method: the dialog shows which base it's going to use and lets you
change it before anything is applied. I know Mark has been asking for this
(cc'ing him for review).

Please let me know if this works for your workflow, or if you run into
problems, or if I completely misunderstood the request. :)

-K

  reply	other threads:[~2026-10-20 19:39 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-05 15:09 Andrew Halaney
2026-10-05 15:09 ` [PATCH v4 01/10] pid: add helpers to operate on a struct pid array Andrew Halaney
2026-10-05 15:09 ` [PATCH v4 02/10] af_unix: record the pid of the sending thread Andrew Halaney
2026-10-08  4:35   ` Kuniyuki Iwashima
2026-10-05 15:09 ` [PATCH v4 03/10] net: add SO_PASSPIDFD_THREAD to get a thread-specific SCM_PIDFD Andrew Halaney
2026-10-08  4:36   ` Kuniyuki Iwashima
2026-10-05 15:09 ` [PATCH v4 04/10] selftests/net: SO_PASSPIDFD_THREAD Andrew Halaney
2026-10-08  5:03   ` Kuniyuki Iwashima
2026-10-05 15:09 ` [PATCH v4 05/10] net: turn sk_peer_pid into an array indexed by pid type Andrew Halaney
2026-10-05 15:09 ` [PATCH v4 06/10] af_unix: record the pid of the connecting thread Andrew Halaney
2026-10-05 15:09 ` [PATCH v4 07/10] net: add SO_PEERPIDFD_THREAD to get a thread-specific pidfd Andrew Halaney
2026-10-05 15:09 ` [PATCH v4 08/10] selftests/net: SO_PEERPIDFD_THREAD Andrew Halaney
2026-10-08  5:05   ` Kuniyuki Iwashima
2026-10-05 15:09 ` [PATCH v4 09/10] pidfs: record the coredump on the dumping thread's pid too Andrew Halaney
2026-10-05 15:09 ` [PATCH v4 10/10] selftests/coredump: check the dumping thread's pidfd Andrew Halaney
2026-10-12  9:00 ` [PATCH v4 00/10] net: support thread-specific pidfds for send and connect Christian Brauner
2026-10-12 15:59 ` Paolo Abeni
2026-10-12 18:14   ` Andrew Halaney
2026-10-16  9:14   ` Christian Brauner
2026-10-16 15:57     ` Jakub Kicinski
2026-10-20 19:39       ` Konstantin Ryabitsev [this message]
2026-10-20 22:07         ` Jakub Kicinski

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=atfAmtsj0LmZtBZs@meerkat.local \
    --to=konstantin@linuxfoundation.org \
    --cc=alexander@mihalicyn.com \
    --cc=andrew@amutable.com \
    --cc=brauner@kernel.org \
    --cc=broonie@kernel.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=horms@kernel.org \
    --cc=jack@suse.cz \
    --cc=kuba@kernel.org \
    --cc=kuniyu@google.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=pabeni@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=willemb@google.com \
    /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

all inboxes | Powered by JetHome®