From: Jeff Johnson <quic_jjohnson@quicinc.com>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: <tools@kernel.org>
Subject: Re: b4 prep confused by rebase from linus/master to linux-next/master?
Date: Tue, 25 Jun 2024 10:35:46 -0700 [thread overview]
Message-ID: <9cff56e8-c529-4acf-a66f-82e0a3c533d8@quicinc.com> (raw)
In-Reply-To: <20240625-voracious-flashy-galago-7632ec@lemur>
On 6/25/2024 10:24 AM, Konstantin Ryabitsev wrote:
> On Tue, Jun 25, 2024 at 09:05:15AM GMT, Jeff Johnson wrote:
>>> Can you paste "b4 prep --show-info" for that branch?
>>
>> I was already able to fix this by manually changing base-branch in the metadata.
>
> Okay, I suspected that you have a non-default cover strategy, right?
>
> -K
Correct. I'm currently using cover-strategy: branch-description
I kept stumbling across issues with the default strategy so I moved to the
branch description strategy.
And it seems that doesn't work well with b4 prep --cleanup either since it
seems to remove the metadata but doesn't actually remove the branch.
With my recent MODULE_DESCRIPTION cleanup I made the realization that having
the metadata in-tree would have been better since I distributed the work
across multiple repos to have per-architecture builds.
So at some point I'll probably go back to the default strategy.
/jeff
next prev parent reply other threads:[~2024-06-25 17:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 22:42 b4 prep confused by rebase from linus/master to linux-next/master? Jeff Johnson
2024-06-25 14:20 ` Konstantin Ryabitsev
2024-06-25 16:05 ` Jeff Johnson
2024-06-25 17:24 ` Konstantin Ryabitsev
2024-06-25 17:35 ` Jeff Johnson [this message]
2024-06-25 17:46 ` 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=9cff56e8-c529-4acf-a66f-82e0a3c533d8@quicinc.com \
--to=quic_jjohnson@quicinc.com \
--cc=konstantin@linuxfoundation.org \
--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