]> git.proxmox.com Git - mirror_qemu.git/commit
Merge tag 'pull-request-2023-10-12' of https://gitlab.com/thuth/qemu into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Mon, 16 Oct 2023 16:35:21 +0000 (12:35 -0400)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 16 Oct 2023 16:36:55 +0000 (12:36 -0400)
commit2a6299fb137e8f0fcee205f584c52481cb8461f7
treedff53b1d4e8d4b206c25dee3bcd178a1ab2cdecf
parentce2f51697bea03956c2ac1ccc17d81e170d68c3b
parentf51f90c65ed7706c3c4f7a889ce3d6b7ab75ef6a
Merge tag 'pull-request-2023-10-12' of https://gitlab.com/thuth/qemu into staging

* Fix CVE-2023-1544
* Deprecate the rdma code
* Fix flaky npcm7xx_timer test
* i2c-echo license statement and Kconfig switch
* Disable the failing riscv64-debian-cross CI job by default

* tag 'pull-request-2023-10-12' of https://gitlab.com/thuth/qemu:
  gitlab-ci: Disable the riscv64-debian-cross-container by default
  MAINTAINERS: Add include/sysemu/qtest.h to the qtest section
  hw/misc/Kconfig: add switch for i2c-echo
  hw/misc/i2c-echo: add copyright/license note
  tests/qtest: Fix npcm7xx_timer-test.c flaky test
  hw/rdma: Deprecate the pvrdma device and the rdma subsystem
  hw/pvrdma: Protect against buggy or malicious guest driver

Conflicts:
  docs/about/deprecated.rst
  Context conflict between RISC-V and RDMA deprecation.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
MAINTAINERS
docs/about/deprecated.rst