The following changes since commit 2a018f6e98782a4931b936a3087404ed81685bac:

  Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging (2018-07-03 23:06:18 +0100)

are available in the git repository at:


  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to e20122ff0faf07cb701d35e39e106d1783c07725:

  checkpatch: handle token pasting better (2018-07-06 18:39:19 +0200)

----------------------------------------------------------------
Bug fixes.

----------------------------------------------------------------
Greg Kurz (1):
      i386: fix '-cpu ?' output for host cpu type

Julia Suvorova (1):
      qtest: Use cpu address space instead of system memory

Michal Privoznik (1):
      pr-helper: Rework socket path handling

Paolo Bonzini (4):
      pr-helper: avoid error on PR IN command with zero request size
      pr-manager-helper: fix memory leak on event
      ioapic: remove useless lower bounds check
      checkpatch: handle token pasting better

xinhua.Cao (1):
      qemu-char: check errno together with ret < 0

 chardev/char-socket.c    |  7 +++-
 hw/intc/ioapic.c         |  2 +-
 qtest.c                  | 39 ++++++++++++-------
 scripts/checkpatch.pl    |  9 ++---
 scsi/pr-manager-helper.c |  1 +
 scsi/qemu-pr-helper.c    | 99 +++++++++++++++++++-----------------------------
 target/i386/cpu.c        | 14 +++----
 7 files changed, 84 insertions(+), 87 deletions(-)
-- 
1.8.3.1

On 6 July 2018 at 18:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 2a018f6e98782a4931b936a3087404ed81685bac:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging (2018-07-03 23:06:18 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to e20122ff0faf07cb701d35e39e106d1783c07725:
>
>   checkpatch: handle token pasting better (2018-07-06 18:39:19 +0200)
>
> ----------------------------------------------------------------
> Bug fixes.
>
> ----------------------------------------------------------------
> Greg Kurz (1):
>       i386: fix '-cpu ?' output for host cpu type
>
> Julia Suvorova (1):
>       qtest: Use cpu address space instead of system memory
>
> Michal Privoznik (1):
>       pr-helper: Rework socket path handling
>
> Paolo Bonzini (4):
>       pr-helper: avoid error on PR IN command with zero request size
>       pr-manager-helper: fix memory leak on event
>       ioapic: remove useless lower bounds check
>       checkpatch: handle token pasting better
>
> xinhua.Cao (1):
>       qemu-char: check errno together with ret < 0

Applied, thanks.

-- PMM