Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (93 commits)
  net: Warn about "-net nic" options which were ignored
  net: Don't warn about the default network setup
  Revert "net: Improve the warnings for dubious command line option combinations"
  Optimize screendump
  kvm: fix FPU state subsection
  KVM: Fix XSAVE feature bit enumeration
  Remove unneeded kvm.h from cpu-exec.c
  kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid
  kvm: Clean up stubs
  kvm: ppc: Drop KVM_CAP build dependencies
  kvm: x86: Drop KVM_CAP build dependencies
  kvm: Drop KVM_CAP build dependencies
  kvm: Drop useless zero-initializations
  kvm: ppc: Drop CONFIG_KVM_PPC_PVR
  kvm: Drop CONFIG_KVM_PARA
  Switch build system to accompanied kernel headers
  Import kernel headers
  Add kernel header update script
  cmd: fix operator precedence
  Fix typo in cpus.c
  ...

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