Need clue: b4 working with dependencies

Need clue: b4 working with dependencies

[Jeff Johnson]

Moving this thread from workflows to tools and renaming...

On 5/28/2025 8:22 AM, Konstantin Ryabitsev wrote:
> On Wed, May 28, 2025 at 07:19:55AM -0700, Jeff Johnson wrote:
>> patchwork itself very recently formalized the usage of a 'Depends-on:' tag for
>> flagging patchset dependencies:
>>
>> https://lists.ozlabs.org/pipermail/patchwork/2025-January/007465.html
>> https://lists.ozlabs.org/pipermail/patchwork/2025-March/007490.html
>> https://github.com/getpatchwork/patchwork/commit/bc2d1b1dcf89c619e027ae4dfd3036cba30e5583
>> https://patchwork.ozlabs.org/project/patchwork/list/?series=442332&state=*
>>
>> Note that this support is only in mainline and not part of any release yet.
>>
>> Curious if the Linux Kernel community will adopt this approach for flagging
>> dependencies.
> 
> We've been supporting something like this in b4 for a while now, but we use
> prerequisite-* trailers (not tags) and always expand that into
> prerequisite-patch-id, since that's the only format documented by git itself.
> 
> E.g. here is an example of a series using prerequisite-change-id:
> https://lore.kernel.org/b4-sent/20250526-sip_svc_upstream-v3-0-6a08a4502de3@altera.com/
> 
> Here's another one using prerequisite-message-id:
> https://lore.kernel.org/b4-sent/20250514-ipq5018-pcie-v10-0-5b42a8eff7ea@outlook.com/

In this example what adds:
prerequisite-message-id: <20250317100029.881286-1-quic_varada@quicinc.com>
prerequisite-patch-id: 210bd857b2a3ce208c6c66389d2845616dafae60
prerequisite-patch-id: 27a1070861e75cf1dcb03f1e440618bd77b32043
prerequisite-patch-id: 4dfad74bedd5e7b3b628ead0b23baed7de8b88f7
prerequisite-patch-id: 79ded164c537cfe947447c920602570626eddb3d

Does that come from the tooling or from the human?

> 
> The documentation is here:
> https://b4.docs.kernel.org/en/latest/contributor/prep.html#working-with-series-dependencies
> 
> I'm not sure "Depends-on:" as an actual commit tag will be accepted by the
> kernel community, because it's information that is only useful during
> pre-commit stages. However, if it's passed along as a cover letter/first patch
> trailers, we can recognize it as an alternative for "prerequisite-message-id".

I'm trying something very basic.

In my ath.git tree I have a base tag ath-202506031604 (hash c3910de7bab7)
I have a public patch I created with b4:
20250605-hal_reo_cmd_status-kdoc-v1-1-e59f4b814b88@oss.qualcomm.com

This has the b4-generated trailers:
base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5

Now I want to create a new patch based upon this published patch.
I tried:
b4 prep -n hal_reo_cmd_drain -f b4/hal_reo_cmd_status-kdoc
make edits
git commit...
b4 prep --edit-deps
  (add the following from the published patch)
  base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
  change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5

b4 prep --check-deps
Checking base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
Checking change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5:v1
Grabbing search results from lore.kernel.org
Grabbing thread from lore.kernel.org/all/20250605-hal_reo_cmd_status-kdoc-v1-1-e59f4b814b88@oss.qualcomm.com/t.mbox.gz
Testing if all patches can be applied to c3910de7bab78afbc106206aed5ec8e79458fbee
  [PATCH] wifi: ath12k: Fix hal_reo_cmd_status kernel-doc
Magic: Preparing a sparse worktree
---
● change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5:v1
● base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee

So far this seems ok.
Then continue:
b4 prep --auto-to-cc
b4 prep --edit-cover
b4 prep --check
  runs checkpatch, gives Success: 1, Warning: 0, Error: 0

Finally:
b4 send --no-sign --reflect

The reflected message has the footer:
base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
change-id: 20250605-hal_reo_cmd_drain-801771bbf653

There is nothing that reflects the dependency, and the patch in the e-mail does NOT apply cleanly to the base commit.

So I'm apparently missing a step to have the prerequisite-* tag(s) added.

Re: Need clue: b4 working with dependencies

[Konstantin Ryabitsev]

On Thu, Jun 05, 2025 at 04:05:44PM -0700, Jeff Johnson wrote:
> I'm trying something very basic.
> 
> In my ath.git tree I have a base tag ath-202506031604 (hash c3910de7bab7)
> I have a public patch I created with b4:
> 20250605-hal_reo_cmd_status-kdoc-v1-1-e59f4b814b88@oss.qualcomm.com
> 
> This has the b4-generated trailers:
> base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
> change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5
> 
> Now I want to create a new patch based upon this published patch.
> I tried:
> b4 prep -n hal_reo_cmd_drain -f b4/hal_reo_cmd_status-kdoc
> make edits
> git commit...
> b4 prep --edit-deps
>   (add the following from the published patch)
>   base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
>   change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5

Should have ":vN" on the end to indicate which revision:

    change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5:v1

> b4 prep --check-deps
> Checking base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
> Checking change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5:v1
> Grabbing search results from lore.kernel.org
> Grabbing thread from lore.kernel.org/all/20250605-hal_reo_cmd_status-kdoc-v1-1-e59f4b814b88@oss.qualcomm.com/t.mbox.gz
> Testing if all patches can be applied to c3910de7bab78afbc106206aed5ec8e79458fbee
>   [PATCH] wifi: ath12k: Fix hal_reo_cmd_status kernel-doc
> Magic: Preparing a sparse worktree
> ---
> ● change-id: 20250604-hal_reo_cmd_status-kdoc-c3f3a25237c5:v1
> ● base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
> 
> So far this seems ok.
> Then continue:
> b4 prep --auto-to-cc
> b4 prep --edit-cover
> b4 prep --check
>   runs checkpatch, gives Success: 1, Warning: 0, Error: 0
> 
> Finally:
> b4 send --no-sign --reflect
> 
> The reflected message has the footer:
> base-commit: c3910de7bab78afbc106206aed5ec8e79458fbee
> change-id: 20250605-hal_reo_cmd_drain-801771bbf653
> 
> There is nothing that reflects the dependency, and the patch in the e-mail does NOT apply cleanly to the base commit.
> 
> So I'm apparently missing a step to have the prerequisite-* tag(s) added.

The fact that it's quietly failing is a bug. I'll add it to the tracker.

Thanks for the report.

bugspray tag me

Re: Need clue: b4 working with dependencies

[Bugspray Bot]

Hello:

This conversation is now tracked by Kernel.org Bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=220201

There is no need to do anything else, just keep talking.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (bugspray 0.1-dev)