On 10/5/22 17:23, Alex Bennée wrote:
Stefan Hajnoczi <[email protected]> writes:
On Tue, 4 Oct 2022 at 09:38, Alex Bennée <[email protected]> wrote:
The following changes since commit efbf38d73e5dcc4d5f8b98c6e7a12be1f3b91745:
Merge tag 'for-upstream' of git://repo.or.cz/qemu/kevin into staging
(2022-10-03 15:06:07 -0400)
are available in the Git repository at:
https://github.com/stsquad/qemu.git
tags/pull-testing-gdbstub-plugins-gitdm-041022-1
Hi Alex,
Please rebase and resend. There is a merge conflict.
Any clue as to where - because it rebased cleanly for me.
That's because "[PULL 12/54] configure: do not invoke as/ld directly for
pc-bios/optionrom" was also part of my pull request. Rebasing and
resending will do the right thing, as it will remove your copy of that
patch from your branch.
Paolo
