From: Stefan Hajnoczi <stefanha@gmail.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [PULL 0/2] Seabios 1.17.0 20250611 patches
Date: Thu, 12 Jun 2025 10:33:03 -0400 [thread overview]
Message-ID: <CAJSP0QU-msg=bTwODkB5VPoiwMcDC_ozN=7MuG5tFDNiNDNOKg@mail.gmail.com> (raw)
In-Reply-To: <4ftyylwfpk2d6xioduftadbbwq3cydjmzeaqivksseem4a2h5d@xg7u6y6qaaak>
On Thu, Jun 12, 2025 at 10:16 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Hi,
>
> > I didn't fix it. GitLab's mirror operation is still failing. Your
> > suggestion of force pushing should fix it, but I want to understand
> > why a commit was lost first.
> >
> > The issue is that QEMU's mirror and upstream have diverged. The
> > following commit is only in QEMU's mirror repo:
> >
> > commit 44693a974cd90917f81a7d0310df4b592edd7e09
> > Author: Christopher Lentocha <christopherericlentocha@gmail.com>
> > Date: Tue Jan 21 11:59:14 2025 -0500
> >
> > Fix AHCI Disk Detection when using EDK2 CSM
> >
> > It is not possible to fast-forward to upstream's master due to this difference.
> >
> > Gerd: Do you know what happened to this commit upstream?
>
> Hmm, no idea. Didn't notice it got lost until now. Also can't remember
> having seen a non-ff update on the seabios master branch when pulling.
>
> Either me or Kevin must have deleted it by accident, or something went
> wrong with the coreboot git server (where seabios git repo is hosted).
>
> Guess we must do a forced update once to get them back in sync.
Do you still want me to go ahead with the SeaBIOS update you posted?
I'm asking because if QEMU drops the commit I mentioned above, then I
guess EDK2 CSM AHCI detection will break. That would be a regression.
Stefan
next prev parent reply other threads:[~2025-06-12 14:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 7:50 [PULL 0/2] Seabios 1.17.0 20250611 patches Gerd Hoffmann
2025-06-11 7:50 ` [PULL 1/2] seabios: update submodule to 1.17.0 Gerd Hoffmann
2025-06-11 7:50 ` [PULL 2/2] seabios: update binaries " Gerd Hoffmann
2025-06-11 18:01 ` [PULL 0/2] Seabios 1.17.0 20250611 patches Daniel P. Berrangé
2025-06-11 19:21 ` Stefan Hajnoczi
2025-06-12 10:16 ` Daniel P. Berrangé
2025-06-12 12:59 ` Stefan Hajnoczi
2025-06-11 18:22 ` Stefan Hajnoczi
2025-06-11 18:30 ` Thomas Huth
2025-06-11 19:09 ` Stefan Hajnoczi
2025-06-12 4:36 ` Thomas Huth
2025-06-12 13:08 ` Stefan Hajnoczi
2025-06-12 14:16 ` Gerd Hoffmann
2025-06-12 14:33 ` Stefan Hajnoczi [this message]
2025-06-12 14:40 ` Daniel P. Berrangé
2025-06-12 14:53 ` Gerd Hoffmann
2025-06-12 15:00 ` Stefan Hajnoczi
2025-06-12 15:05 ` Thomas Huth
2025-06-16 17:33 ` Stefan Hajnoczi
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='CAJSP0QU-msg=bTwODkB5VPoiwMcDC_ozN=7MuG5tFDNiNDNOKg@mail.gmail.com' \
--to=stefanha@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=kraxel@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/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).