From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Will Deacon <will@kernel.org>
Cc: tools@kernel.org, Jason Gunthorpe <jgg@nvidia.com>,
Nicolin Chen <nicolinc@nvidia.com>
Subject: Re: [PATCH v2 0/2] b4: ty: Fix incorrect patch/commit association
Date: Thu, 2 May 2024 14:31:19 -0400 [thread overview]
Message-ID: <20240502-secret-tireless-emu-acfef2@lemur> (raw)
In-Reply-To: <20240502092354.GA16551@willie-the-truck>
On Thu, May 02, 2024 at 10:23:54AM GMT, Will Deacon wrote:
> > Applied, thanks!
> >
> > [1/2] ty: Try subject matching for every commit before using trackers
> > commit: 47bd55d3182d875802700670270f5ee0877a8d5d
> > [2/2] ty: Remove unused 'matches' variable
> > commit: dced92071d2135ccbec521cb4face63cafcdc407
>
> You applied these already (with different SHAs), I think:
>
> https://lore.kernel.org/r/170958794467.8875.12454526353405240108.b4-ty@linuxfoundation.org
>
> So I'm not sure what's happened here :/
Bah, you're right. I blame the split brain between b4 and patchwork here
-- for some reason in patchwork these were still showing as unprocessed.
Effectively the 2nd time was a no-op:
$ git log --oneline --reverse 590044aff85f3e11cbd5efb9e192847bb3b51b3f..
47bd55d ty: Try subject matching for every commit before using trackers
dced920 ty: Remove unused 'matches' variable
775893e (HEAD -> master, origin/master, github/master) Merge patch series "b4: ty: Fix incorrect patch/commit association"
$ git diff 590044aff85f3e11cbd5efb9e192847bb3b51b3f..
(no output)
I am actually annoyed that this operation doesn't throw an error and
doubly annoyed that the only way to fix this is to rebase -- but rebase
I will.
Sorry about the mess.
-K
prev parent reply other threads:[~2024-05-02 18:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-04 13:42 [PATCH v2 0/2] b4: ty: Fix incorrect patch/commit association Will Deacon
2024-03-04 13:42 ` [PATCH v2 1/2] ty: Try subject matching for every commit before using trackers Will Deacon
2024-03-04 13:42 ` [PATCH v2 2/2] ty: Remove unused 'matches' variable Will Deacon
2024-03-04 21:32 ` [PATCH v2 0/2] b4: ty: Fix incorrect patch/commit association Konstantin Ryabitsev
2024-05-01 21:23 ` Konstantin Ryabitsev
2024-05-02 9:23 ` Will Deacon
2024-05-02 18:31 ` Konstantin Ryabitsev [this message]
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=20240502-secret-tireless-emu-acfef2@lemur \
--to=konstantin@linuxfoundation.org \
--cc=jgg@nvidia.com \
--cc=nicolinc@nvidia.com \
--cc=tools@kernel.org \
--cc=will@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 read-only IMAP folder(s) and NNTP newsgroup(s).