From: Vlastimil Babka <vbabka@suse.cz>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>,
tools@linux.kernel.org
Subject: Re: b4 v0.8.0 is available
Date: Wed, 1 Sep 2021 16:48:05 +0200 [thread overview]
Message-ID: <582896df-8791-43f5-1422-db00e92b8291@suse.cz> (raw)
In-Reply-To: <20210901141637.fmvgs4hnk6m4ym7x@meerkat.local>
On 9/1/21 16:16, Konstantin Ryabitsev wrote:
> Other than lore.kernel.org compatibility changes, the only significant
> difference with version 0.7.3 is the --guess-base code, which should be a lot
> more useful with this release. E.g. this message back from June is
> successfully resolved to match the commit without any conflicts (gc485f7e98):
>
> https://lore.kernel.org/lkml/20210617101910.13228-1-song.bao.hua@hisilicon.com/T/#t
>
> Link: https://lore.kernel.org/r/20210617101910.13228-1-song.bao.hua@hisilicon.com
> attempting to guess base-commit...
> Base: tags/v5.13-rc1-284-gc485f7e9863c (exact match)
I don't know how exactly it works, but looks like it could
still try a bit harder?
b4 am --guess-base 20210819195533.211756-1-hannes@cmpxchg.org
...
Link: https://lore.kernel.org/r/20210819195533.211756-1-hannes@cmpxchg.org
attempting to guess base-commit...
Base: tags/v5.14-rc1-55-g00c85b6576d3 (best guess, 3/8 blobs matched)
git checkout -b 20210819_hannes_cmpxchg_org tags/v5.14-rc1-55-g00c85b6576d3
git am ./20210819_hannes_mm_kconfig_move_swap_and_slab_config_options_to_the_mm_section.mbx
3/8 blobs matched means "git am" fails
The earliest commit where it succeeds isn't that far away, actually:
git describe 2a03085ce887^
v5.13-257-gf356aeacf7bb
Thanks,
Vlastimil
next prev parent reply other threads:[~2021-09-01 14:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 14:16 b4 v0.8.0 is available Konstantin Ryabitsev
2021-09-01 14:48 ` Vlastimil Babka [this message]
2021-09-01 18:02 ` Konstantin Ryabitsev
2021-09-01 19:16 ` Vlastimil Babka
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=582896df-8791-43f5-1422-db00e92b8291@suse.cz \
--to=vbabka@suse.cz \
--cc=konstantin@linuxfoundation.org \
--cc=tools@linux.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).