The following changes since commit 7bd9d0a9e26c7a3c67c0f174f0009ba19969b158:

  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-02-04' into staging (2020-02-04 16:12:31 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 8ef350b32fe08d254f92a3a7efe89809397fff77:

  MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines (2020-02-06 12:32:03 +0100)

----------------------------------------------------------------
trivial patches 20200206

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

Chen Qun (1):
  monitor: fix memory leak in monitor_fdset_dup_fd_find_remove

John Snow (1):
  qemu-options: replace constant 1 with HAS_ARG

Julia Suvorova (2):
  qemu-img: Place the '-i aio' option in alphabetical order
  hw/pci/pci_bridge: Fix typo in comment

Leif Lindholm (1):
  MAINTAINERS: update Leif Lindholm's address

Miroslav Rezanina (1):
  aspeed/i2c: Prevent uninitialized warning

Philippe Mathieu-Daudé (4):
  hw/smbios/smbios: Remove unused include
  hw/timer/m48t59: Convert debug printf()s to trace events
  MAINTAINERS: Cover hppa-softmmu.mak in the HP-PARISC Machines section
  MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines

Thomas Huth (2):
  hw/bt: Remove empty Kconfig file
  hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without
    vmport

 .mailmap                    |  1 +
 MAINTAINERS                 | 10 +++++++++-
 docs/interop/qemu-img.rst   |  8 ++++----
 hw/bt/Kconfig               |  0
 hw/i2c/aspeed_i2c.c         |  2 +-
 hw/i386/vmmouse.c           |  6 ++++++
 hw/rtc/m48t59-internal.h    |  5 -----
 hw/rtc/m48t59.c             | 11 +++++------
 hw/rtc/trace-events         |  6 ++++++
 hw/smbios/smbios.c          |  1 -
 include/hw/pci/pci_bridge.h |  2 +-
 monitor/misc.c              |  1 +
 qemu-img-cmds.hx            |  4 ++--
 qemu-options.hx             |  2 +-
 14 files changed, 37 insertions(+), 22 deletions(-)
 delete mode 100644 hw/bt/Kconfig

-- 
2.24.1

On Thu, 6 Feb 2020 at 12:50, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 7bd9d0a9e26c7a3c67c0f174f0009ba19969b158:
>
>   Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-02-04' into staging (2020-02-04 16:12:31 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
>
> for you to fetch changes up to 8ef350b32fe08d254f92a3a7efe89809397fff77:
>
>   MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines (2020-02-06 12:32:03 +0100)
>
> ----------------------------------------------------------------
> trivial patches 20200206
>
> ----------------------------------------------------------------


Applied, thanks.

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

-- PMM

From: Thomas Huth <thuth@redhat.com>

While removing the bluetooth code some weeks ago, I had to leave the
hw/bt/Kconfig file around. Otherwise some of the builds would have been
broken since the generated dependency files tried to include it before
they were rebuilt. Meanwhile, all those dependency files should have
been updated, so we can remove the empty Kconfig file now, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200123064525.6935-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/bt/Kconfig | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 hw/bt/Kconfig

diff --git a/hw/bt/Kconfig b/hw/bt/Kconfig
deleted file mode 100644
index e69de29bb2d1..000000000000
-- 
2.24.1