Merge commit '15b2bd1847239fe0b4a1041b69a631741d2e273a' into upstream-merge

Merge commit '15b2bd1847239fe0b4a1041b69a631741d2e273a' into upstream-merge

* commit '15b2bd1847239fe0b4a1041b69a631741d2e273a':
  virtio: move common irqfd handling out of virtio-pci
  virtio: move common ioeventfd handling out of virtio-pci
  event_notifier: add event_notifier_set_handler
  memory: pass EventNotifier, not eventfd
  ivshmem: wrap ivshmem_del_eventfd loops with transaction
  ivshmem: use EventNotifier and memory API
  event_notifier: add event_notifier_init_fd
  event_notifier: remove event_notifier_test
  event_notifier: add event_notifier_set
  apic: Defer interrupt updates to VCPU thread
  apic: Reevaluate pending interrupts on LVT_LINT0 changes
  apic: Resolve potential endless loop around apic_update_irq
  kvm: expose tsc deadline timer feature to guest
  kvm_pv_eoi: add flag support
  kvm: Don't abort on kvm_irqchip_add_msi_route()

Conflicts:
	kvm.h

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