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 09:05:15 -0700 [thread overview]
Message-ID: <b4bdcc6e-95fe-41ae-bedc-9fc4ad385570@quicinc.com> (raw)
In-Reply-To: <20240625-sepia-tarantula-of-diversity-adee66@lemur>
On 6/25/2024 7:20 AM, Konstantin Ryabitsev wrote:
> On Mon, Jun 24, 2024 at 03:42:02PM GMT, Jeff Johnson wrote:
>> I have a b4-managed branch that was originally based upon linus/master.
>> However that patch had a conflict with linux-next/master, so I rebased my b4
>> branch to linux-next/master and resolved the conflicts. But that seems to have
>> confused b4 since I don't get the expected results from:
>> [jjohnson:development 8934] b4 prep --check
>> [jjohnson:development 8935] b4 prep -c
>> Will collect To: addresses using get_maintainer.pl
>> Will collect Cc: addresses using get_maintainer.pl
>> [jjohnson:development 8936] b4 send --no-sign --reflect
>> [jjohnson:development 8937] b4 --version
>> 0.14.0
>
> Can you paste "b4 prep --show-info" for that branch?
>
> -K
I was already able to fix this by manually changing base-branch in the metadata.
/jeff
next prev parent reply other threads:[~2024-06-25 16:05 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 [this message]
2024-06-25 17:24 ` Konstantin Ryabitsev
2024-06-25 17:35 ` Jeff Johnson
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=b4bdcc6e-95fe-41ae-bedc-9fc4ad385570@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