Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (55 commits)
  microblaze: Handle singlestepping over direct jmps
  target-arm: implement vsli.64, vsri.64
  target-arm: fix VSHLL Neon instruction.
  [PATCH] [MIPS] Clear softfpu exception state for round, trunc, ceil and floor
  target-arm: Fix 32 bit signed saturating narrow
  target-arm: Fix VQMOVUN Neon instruction.
  linux-user: fix for loopmount ioctl
  linux-user: fix build errors for mmap2-only ports
  user: speed up init_paths a bit
  linux-user: implement sched_{g,s}etaffinity
  linux-user/FLAT: allow targets to override FLAT processing
  linux-user/FLAT: fix auto-stack sizing
  linux-user: decode MAP_{UNINITIALIZED,EXECUTABLE} in strace
  linux-user: add ppoll syscall support
  linux-user/elfload: add FDPIC support
  linux-user: fix sizeof handling for getsockopt
  linux-user: Fix possible realloc memory leak
  linux-user: Add support for -version option
  cris, microblaze: use cpu_has_work
  x86: Fix MCA broadcast parameters for TCG case
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>