On 6/5/26 08:14, Markus Armbruster wrote:
Philippe Mathieu-Daudé <[email protected]> writes:
Hi Stefan,
On 5/5/26 16:00, Stefan Hajnoczi wrote:
On Tue, May 5, 2026 at 8:59 AM Philippe Mathieu-Daudé <[email protected]> wrote:
On 5/5/26 14:34, Markus Armbruster wrote:
The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
(2026-05-01 14:41:49 -0400)
are available in the Git repository at:
https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
----------------------------------------------------------------
Monitor patches for 2026-05-05
----------------------------------------------------------------
[email protected] (1):
monitor: Add `clear` command
Dr. David Alan Gilbert (3):
hmp*hx: Move info docs
hxtool: Split srst/erst add checks
hxtool: Error on missing docs
include/monitor/hmp.h | 1 +
monitor/hmp-cmds.c | 11 +++++++++++
hmp-commands-info.hx | 9 +--------
hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
5 files changed, 80 insertions(+), 21 deletions(-)
Obviously this conflicts with the PR I'm waiting since 10 days to post:
$ git merge pull-monitor-2026-05-05
Auto-merging hmp-commands-info.hx
Auto-merging hmp-commands.hx
CONFLICT (content): Merge conflict in hmp-commands.hx
Auto-merging include/monitor/hmp.h
Auto-merging monitor/hmp-cmds.c
Automatic merge failed; fix conflicts and then commit the result.
Sigh.
I'm sorry.
Hi,
What is blocking you from sending your PR and who can do something about it?
Sorry, this comment was for Markus. I understood he wanted to have a
look on patches related to monitor I was going to pull:
https://lore.kernel.org/qemu-devel/[email protected]/
Yes, I'd like to have a look. But I'm under water, so what I like
doesn't matter. I'll have to rely on the review of others here.
All patches have at least 1 Reviewed-by tag. We also rely on CI. If you
noticed something that shouldn't have been merged, please point me to it
and consider adding a CI tests.
More than 1 week passed so I think we are good. Do not hold on Markus
pull-monitor-2026-05-05 tag, I'll wait it gets merged then fix the
conflicts and post mine.
Go right ahead.
Thank you!
