[qemu-xen master] Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging

[patchbot@xxxxxxx]

commit 3d7cad3c2388cb74451d50cf455a42d349236161
Merge: 48f22ad04ead83e61b4b35871ec6f6109779b791 
89615cfef57e04da0e5a1bd212a62f8696468e79
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Thu Jul 9 14:13:19 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Thu Jul 9 14:13:19 2020 +0100

    Merge remote-tracking branch 
'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging
    
    trivial branch patches 20200707
    
    # gpg: Signature made Tue 07 Jul 2020 11:52:06 BST
    # gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
    # gpg:                issuer "laurent@xxxxxxxxx"
    # gpg: Good signature from "Laurent Vivier <lvivier@xxxxxxxxxx>" [full]
    # gpg:                 aka "Laurent Vivier <laurent@xxxxxxxxx>" [full]
    # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@xxxxxxxxxx>" 
[full]
    # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F 
BE3C
    
    * remotes/vivier2/tags/trivial-branch-for-5.1-pull-request:
      net/tap-solaris.c: Include qemu-common.h for TFR macro
      intel_iommu: "aw-bits" error message still refers to "x-aw-bits"
      util/qemu-option: Document the get_opt_value() function
      MAINTAINERS: Update Radoslaw Biernacki email address
      .mailmap: Update Alexander Graf email address
      trivial: Respect alphabetical order of .o files in Makefile.objs
      fix the prototype of muls64/mulu64
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 .mailmap                  |  2 ++
 MAINTAINERS               |  2 +-
 hw/i386/intel_iommu.c     |  2 +-
 include/qemu/host-utils.h |  4 ++--
 include/qemu/option.h     | 13 +++++++++++++
 net/tap-solaris.c         |  1 +
 stubs/Makefile.objs       |  2 +-
 7 files changed, 21 insertions(+), 5 deletions(-)

--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master