[PULL 00/18] Trivial branch for 5.2 patches

Laurent Vivier posted 18 patches 3 years, 6 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
Kconfig.host             |  4 ++--
Makefile                 | 10 ++++++----
hw/acpi/tco.c            | 11 -----------
hw/arm/pxa2xx.c          |  2 +-
hw/dma/xlnx_dpdma.c      |  2 +-
hw/gpio/max7310.c        | 11 +++++------
hw/gpio/omap_gpio.c      |  6 ++++--
hw/hyperv/vmbus.c        |  3 ++-
hw/isa/isa-bus.c         |  9 ++-------
hw/mips/fuloong2e.c      |  5 +----
hw/net/e1000e_core.c     |  2 --
hw/net/fsl_etsec/etsec.c |  2 +-
hw/net/fsl_etsec/rings.c |  2 +-
hw/sd/sd.c               |  2 +-
hw/usb/redirect.c        |  2 +-
include/qemu-common.h    |  3 ++-
meson.build              |  4 ++--
net/colo-compare.c       | 24 ++++++++++++------------
net/net.c                |  2 +-
target/i386/kvm.c        |  5 +++--
tests/test-vmstate.c     |  3 ---
util/hexdump.c           |  4 +++-
util/iov.c               |  2 +-
23 files changed, 52 insertions(+), 68 deletions(-)
[PULL 00/18] Trivial branch for 5.2 patches
Posted by Laurent Vivier 3 years, 6 months ago
The following changes since commit 9435a8b3dd35f1f926f1b9127e8a906217a5518a:

  Merge remote-tracking branch 'remotes/kraxel/tags/sirius/ipxe-20200908-pull=
-request' into staging (2020-09-08 21:21:13 +0100)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-for-5.2-pull-request

for you to fetch changes up to 8821e21414468b1810f0ccf38bcbfa5c0bd1d56b:

  target/i386/kvm: Add missing fallthrough comment (2020-09-11 21:25:59 +0200)

----------------------------------------------------------------
trivial patches pull request 20200911

----------------------------------------------------------------

Greg Kurz (2):
  Makefile: Drop extra phony cscope
  Makefile: Skip the meson subdir in cscope/TAGS/ctags

Jon Doron (1):
  hw: hyperv: vmbus: Fix 32bit compilation

Pan Nengyuan (1):
  test-vmstate: remove unnecessary code in match_interval_mapping_node

Paolo Bonzini (1):
  kconfig: fix comment referring to old Makefiles

Philippe Mathieu-Daud=C3=A9 (10):
  hw/mips/fuloong2e: Convert pointless error message to an assert()
  hw/isa/isa-bus: Replace hw_error() by assert()
  hw/acpi/tco: Remove unused definitions
  hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR)
  hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP)
  hw/net/e1000e: Remove overwritten read handler for STATUS register
  hw/net/e1000e: Remove duplicated write handler for FLSWDATA register
  target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken()
  util/hexdump: Convert to take a void pointer argument
  util/hexdump: Reorder qemu_hexdump() arguments

Sergei Trofimovich (1):
  meson.build: tweak sdl-image error message

Thomas Huth (2):
  hw/arm/pxa2xx: Add missing fallthrough comment
  target/i386/kvm: Add missing fallthrough comment

 Kconfig.host             |  4 ++--
 Makefile                 | 10 ++++++----
 hw/acpi/tco.c            | 11 -----------
 hw/arm/pxa2xx.c          |  2 +-
 hw/dma/xlnx_dpdma.c      |  2 +-
 hw/gpio/max7310.c        | 11 +++++------
 hw/gpio/omap_gpio.c      |  6 ++++--
 hw/hyperv/vmbus.c        |  3 ++-
 hw/isa/isa-bus.c         |  9 ++-------
 hw/mips/fuloong2e.c      |  5 +----
 hw/net/e1000e_core.c     |  2 --
 hw/net/fsl_etsec/etsec.c |  2 +-
 hw/net/fsl_etsec/rings.c |  2 +-
 hw/sd/sd.c               |  2 +-
 hw/usb/redirect.c        |  2 +-
 include/qemu-common.h    |  3 ++-
 meson.build              |  4 ++--
 net/colo-compare.c       | 24 ++++++++++++------------
 net/net.c                |  2 +-
 target/i386/kvm.c        |  5 +++--
 tests/test-vmstate.c     |  3 ---
 util/hexdump.c           |  4 +++-
 util/iov.c               |  2 +-
 23 files changed, 52 insertions(+), 68 deletions(-)

--=20
2.26.2


Re: [PULL 00/18] Trivial branch for 5.2 patches
Posted by Peter Maydell 3 years, 6 months ago
On Fri, 11 Sep 2020 at 20:35, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 9435a8b3dd35f1f926f1b9127e8a906217a5518a:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/sirius/ipxe-20200908-pull=
> -request' into staging (2020-09-08 21:21:13 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-for-5.2-pull-request
>
> for you to fetch changes up to 8821e21414468b1810f0ccf38bcbfa5c0bd1d56b:
>
>   target/i386/kvm: Add missing fallthrough comment (2020-09-11 21:25:59 +0200)
>
> ----------------------------------------------------------------
> trivial patches pull request 20200911
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM