From: Andrew Morton Signed-off-by: Andrew Morton --- include/linux/kvm_host.h | 5 ----- virt/kvm/kvm_main.c | 4 ---- 2 files changed, 9 deletions(-) diff -puN include/linux/kvm_host.h~linux-next-git-rejects include/linux/kvm_host.h --- a/include/linux/kvm_host.h~linux-next-git-rejects +++ a/include/linux/kvm_host.h @@ -316,12 +316,7 @@ void kvm_set_irq(struct kvm *kvm, int ir void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi); void kvm_register_irq_ack_notifier(struct kvm *kvm, struct kvm_irq_ack_notifier *kian); -<<<<<<< HEAD:include/linux/kvm_host.h -void kvm_unregister_irq_ack_notifier(struct kvm *kvm, - struct kvm_irq_ack_notifier *kian); -======= void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian); ->>>>>>> FETCH_HEAD:include/linux/kvm_host.h int kvm_request_irq_source_id(struct kvm *kvm); void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id); diff -puN virt/kvm/kvm_main.c~linux-next-git-rejects virt/kvm/kvm_main.c --- a/virt/kvm/kvm_main.c~linux-next-git-rejects +++ a/virt/kvm/kvm_main.c @@ -143,11 +143,7 @@ static void kvm_free_assigned_device(str if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested) free_irq(assigned_dev->host_irq, (void *)assigned_dev); -<<<<<<< HEAD:virt/kvm/kvm_main.c - kvm_unregister_irq_ack_notifier(kvm, &assigned_dev->ack_notifier); -======= kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier); ->>>>>>> FETCH_HEAD:virt/kvm/kvm_main.c kvm_free_irq_source_id(kvm, assigned_dev->irq_source_id); if (cancel_work_sync(&assigned_dev->interrupt_work)) _