On Thu, Jun 12, 2025 at 10:33:03AM -0400, Stefan Hajnoczi wrote: > On Thu, Jun 12, 2025 at 10:16 AM Gerd Hoffmann <kra...@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 <christopherericlento...@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.
AFAICT it wouldn't be a regression from QEMU's POV. The original git submodule hash pre-dates this EDK2 CSM commit, and the new git submodule hash references a history that doesn't include this EDK2 CSM commit. So nothing in qemu ever referenced this commit. The only way anyone would have ever used this EDK2 CSM commit is if they built directly from our mirrored seabios.git, instead of using our git submodule with roms/Makefile, or the official upstream seabios.git With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
