Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Conflicts:
	virt/kvm/assigned-dev.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc virt/kvm/kvm_main.c
index a5077df4a9fd7990b40c7b4e252868233ccd348d,a944be392d6e9420aa38d833cbc736bf9f07d22e..e0a591df6a7d04a3f29bf2ec251b2ae5ac8fb2eb
--- 1/virt/kvm/kvm_main.c
--- 2/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -440,12 -406,12 +440,15 @@@ static struct kvm *kvm_create_vm(void
  out:
        return kvm;
  
+ #if defined(KVM_COALESCED_MMIO_PAGE_OFFSET) || \
+     (defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER))
  out_err:
        hardware_disable_all();
+ #endif
  out_err_nodisable:
 +      for (i = 0; i < KVM_NR_BUSES; i++)
 +              kfree(kvm->buses[i]);
 +      kfree(kvm->memslots);
        kfree(kvm);
        return ERR_PTR(r);
  }