The following changes since commit 17584289af1aaa72c932e7e47c25d583b329dc45:

  Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request=
' into staging (2020-12-12 18:33:46 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 48f670ecfcbe92f63475c516aefb6e217f469bbf:

  configure / meson: Move check for linux/btrfs.h to meson.build (2020-12-13 =
23:56:16 +0100)

----------------------------------------------------------------
Pull request trivial-patches 20201214

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

Dov Murik (1):
  target/i386: tracing: format length values as hex

Gan Qixin (1):
  ads7846: moves from the hw/display folder to the hw/input folder.

Michael Roth (1):
  MAINTAINERS: update my email address

Pan Nengyuan (4):
  elf2dmp/qemu_elf: Plug memleak in QEMU_Elf_init
  elf2dmp/pdb: Plug memleak in pdb_init_from_file
  block/file-posix: fix a possible undefined behavior
  blockdev: Fix a memleak in drive_backup_prepare()

Peter Maydell (2):
  qemu-options.hx: Fix minor issues in icount documentation
  CODING_STYLE.rst: Be less strict about 80 character limit

Philippe Mathieu-Daud=C3=A9 (1):
  hw/pci-host/pam: Replace magic number by PAM_REGIONS_COUNT definition

Roman Bolshakov (1):
  configure: Test if $make actually exists

Thomas Huth (6):
  configure: Remove the obsolete check for ifaddrs.h
  configure / meson: Move check for pty.h to meson.build
  configure / meson: Move check for drm.h to meson.build
  configure / meson: Move check for sys/signal.h to meson.build
  configure / meson: Move check for sys/kcov.h to meson.build
  configure / meson: Move check for linux/btrfs.h to meson.build

Xinhao Zhang (1):
  hw/xen: Don't use '#' flag of printf format

zhouyang (1):
  fsdev: open brace '{' following struct go on the same line

 CODING_STYLE.rst                |  9 +++--
 MAINTAINERS                     |  4 +--
 block/file-posix.c              |  2 +-
 blockdev.c                      |  1 +
 configure                       | 62 +++------------------------------
 contrib/elf2dmp/pdb.c           |  1 +
 contrib/elf2dmp/qemu_elf.c      |  1 +
 fsdev/9p-marshal.h              | 12 +++----
 fsdev/file-op-9p.h              |  3 +-
 hw/arm/Kconfig                  |  2 +-
 hw/display/Kconfig              |  3 --
 hw/display/meson.build          |  1 -
 hw/input/Kconfig                |  3 ++
 hw/{display =3D> input}/ads7846.c |  0
 hw/input/meson.build            |  1 +
 hw/pci-host/pam.c               |  2 +-
 hw/pci-host/q35.c               |  2 +-
 hw/xen/xen_pt.c                 | 10 +++---
 hw/xen/xen_pt_config_init.c     |  6 ++--
 hw/xen/xen_pt_msi.c             | 16 ++++-----
 include/hw/pci-host/i440fx.h    |  2 +-
 include/hw/pci-host/pam.h       |  2 ++
 include/hw/pci-host/q35.h       |  2 +-
 linux-user/ioctls.h             |  2 +-
 linux-user/syscall.c            |  4 +--
 linux-user/syscall_defs.h       |  2 +-
 meson.build                     |  5 +++
 qemu-options.hx                 | 44 +++++++++++++----------
 target/i386/trace-events        |  6 ++--
 29 files changed, 86 insertions(+), 124 deletions(-)
 rename hw/{display =3D> input}/ads7846.c (100%)

--=20
2.29.2

On Mon, 14 Dec 2020 at 16:06, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 17584289af1aaa72c932e7e47c25d583b329dc45:
>
>   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request=
> ' into staging (2020-12-12 18:33:46 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-for-6.0-pull-request
>
> for you to fetch changes up to 48f670ecfcbe92f63475c516aefb6e217f469bbf:
>
>   configure / meson: Move check for linux/btrfs.h to meson.build (2020-12-13 =
> 23:56:16 +0100)
>
> ----------------------------------------------------------------
> Pull request trivial-patches 20201214
>
> ----------------------------------------------------------------


Applied, thanks.

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

-- PMM