From: Kevin Hilman <khilman@baylibre.com>
To: tools@kernel.org
Subject: b4: prerequisite patch-ids generated in wrong order
Date: Mon, 05 Aug 2024 17:43:55 -0700 [thread overview]
Message-ID: <7h4j7y32gk.fsf@baylibre.com> (raw)
Hello,
In this[1] recently submitted series, I specificially listed:
message-id: <20240801195422.2296347-1-msp@baylibre.com>
in the dependencies (via `b4 prep --edit-deps), and during b4 send (I
think), this turns into `prerequisite-message-id` in the trailers of the
cover letter.
But also it seems to have taken that message-id, grabbed the 3 patch-ids
and also added prerequisite-patch-id to the trailers. That was bit
unexpected, but clever.
However, I think those patch-ids are not in the right order. Because
when try to `b4 shazam` my series, it fails[2] because it is tries to
apply the prerequisite patches in the wrong order (PATCH 2/3, PATCH 3/3,
then PATCH 1/3) which fails, as might be expected.
I'm not sure where all those prerequisite-patch-id are generated, but
there's something fishy going on there.
Also, a dumb Q: why isn't the prerequisite message-id enough? Why does
it also try to generate all the prerequisite-patch-id fields?
Kevin
[1]
https://lore.kernel.org/linux-pm/20240805-lpm-v6-10-constraints-pmdomain-v1-0-d186b68ded4c@baylibre.com/
[2]
$ b4 shazam 20240805-lpm-v6-10-constraints-pmdomain-v1-0-d186b68ded4c@baylibre.com
Grabbing thread from lore.kernel.org/all/20240805-lpm-v6-10-constraints-pmdomain-v1-0-d186b68ded4c@baylibre.com/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 4 messages in the thread
Looking for additional code-review trailers on lore.kernel.org
Analyzing 0 code-review messages
Checking attestation on all messages, may take a moment...
---
✓ [PATCH 1/3] pmdomain: ti_sci: add per-device latency constraint management
✓ [PATCH 2/3] pmdomain: ti_sci: add wakeup constraint management
✓ [PATCH 3/3] pmdomain: ti_sci: handle wake IRQs for IO daisy chain wakeups
---
✓ Signed: openpgp/khilman@baylibre.com
---
NOTE: install dkimpy for DKIM signature verification
---
Total patches: 3
---
Base: using specified base-commit ad7eb1b6b92ee0c959a0a6ae846ddadd7a79ea64
Deps: looking for dependencies matching 3 patch-ids
Grabbing search results from lore.kernel.org
Deps: Applying prerequisite patch: [PATCH v8 2/3] firmware: ti_sci: Add support for querying the firmware caps
Deps: Applying prerequisite patch: [PATCH v8 3/3] firmware: ti_sci: Add system suspend and resume call
Deps: Applying prerequisite patch: [PATCH v8 1/3] firmware: ti_sci: Introduce Power Management Ops
Applying: firmware: ti_sci: Add support for querying the firmware caps
Patch failed at 0001 firmware: ti_sci: Add support for querying the firmware caps
error: patch failed: drivers/firmware/ti_sci.c:3113
error: drivers/firmware/ti_sci.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
next reply other threads:[~2024-08-06 0:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-06 0:43 Kevin Hilman [this message]
2024-08-15 14:28 ` b4: prerequisite patch-ids generated in wrong order Konstantin Ryabitsev
2024-08-15 14:30 ` Kernel.org Bugbot
2024-09-06 16:35 ` Kernel.org Bugbot
2024-09-06 16:42 ` Konstantin Ryabitsev
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=7h4j7y32gk.fsf@baylibre.com \
--to=khilman@baylibre.com \
--cc=tools@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).