Merge commit '22890ab5e825601f4c3d5a1a6b4197904e5d1fee' into upstream-merge

Merge commit '22890ab5e825601f4c3d5a1a6b4197904e5d1fee' into upstream-merge

* commit '22890ab5e825601f4c3d5a1a6b4197904e5d1fee': (76 commits)
  trace: Support for dynamically enabling/disabling trace events
  trace: Add simple built-in tracing backend
  trace: Add trace-events file for declaring trace events
  microblaze: Add support for fcmp.un
  elf: Calculate symbol size if needed
  Fix OpenBSD build warning
  microblaze: User-mode emulation of hw-excp signals
  microblaze: Add basic FPU emulation
  microblaze: Add definitions for FSR reg fields
  Revert "Make default invocation of block drivers safer (v3)"
  Revert "PPC: Qdev'ify e500 pci"
  Revert "PPC: Make e500 pci byte swap config data"
  virtio-9p: Change handling of flags in open() path for 9P2000.L
  [virtio-9p] This patch implements TLERROR/RLERROR on the qemu 9P server.
  [virtio-9p] Remove all instances of unnecessary dotu variable.
  virtio-9p: Add support for removing xattr
  virtio-9p: Fix the memset usage
  virtio-9p: Use lchown which won't follow symlink
  virtio-9p: Add SM_NONE security model
  virtio-9p: Hide user.virtfs xattr in case of mapped security.
  ...

Conflicts:
	monitor.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>