Message ID | 20210512084020.606871-1-pbonzini@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, 12 May 2021 at 09:43, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The following changes since commit e58c7a3bba3076890592f02d2b0e596bf191b5c2: > > Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210510-1' into staging (2021-05-10 17:28:11 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to e804f892b90e58861edd79aafa4d1f4dbdeb3819: > > coverity-scan: list components, move model to scripts/coverity-scan (2021-05-12 04:06:50 -0400) > > ---------------------------------------------------------------- > * AccelCPUClass and sysemu/user split for i386 (Claudio) > * i386 page walk unification > * Fix detection of gdbus-codegen > * Misc refactoring > > ---------------------------------------------------------------- > v1->v2: dropped incorrect snapshot-load patch Something weird has happened here. I think I applied v1 of this pullreq (merge commit 31589644ba069ba06c5 now in master), and then when I came along to try to process this one the tag was an entirely different set of commits. Can you check whether what is in master is what you intended, and send a revert/fixup patch if necessary, please? PS: my scripts detected this issue: Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> ERROR: pull request includes tag with UTF-8 error in person name which you probably want to fix before you send a future pullreq with those commits in. (This error is what nudged me into looking more closely and realizing something weird was going on...) Side note: it is more robust if you don't reuse pullreq tag names... thanks -- PMM
On 13/05/21 21:12, Peter Maydell wrote: > Something weird has happened here. > > I think I applied v1 of this pullreq (merge commit 31589644ba069ba06c5 > now in master), and then when I came along to try to process this > one the tag was an entirely different set of commits. > > Can you check whether what is in master is what you intended, and > send a revert/fixup patch if necessary, please? Yes, it is. You processed the tag that had already moved to v2, but replied to the buggy v1. Paolo
On Thu, 13 May 2021 at 21:39, Paolo Bonzini <pbonzini@redhat.com> wrote: > > On 13/05/21 21:12, Peter Maydell wrote: > > Something weird has happened here. > > > > I think I applied v1 of this pullreq (merge commit 31589644ba069ba06c5 > > now in master), and then when I came along to try to process this > > one the tag was an entirely different set of commits. > > > > Can you check whether what is in master is what you intended, and > > send a revert/fixup patch if necessary, please? > > Yes, it is. You processed the tag that had already moved to v2, but > replied to the buggy v1. If you want me not to process something you do need to reply to the cover letter. Otherwise I won't see it... -- PMM