Subject: linux-next: manual merge of the kvm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Oct 2008 13:58:07 +1100

Hi Avi,

Today's linux-next merge of the kvm tree got a conflict in
include/linux/kvm_host.h virt/kvm/kvm_main.c between commit
5550af4df179e52753d3a43a788a113ad8cd95cd ("KVM: Fix guest shared
interrupt with in-kernel irqchip") from Linus' tree and commit
89c6b6a1b5059efa255ec254c8ee6667bdf6b2a0 ("KVM: IRQ ACK notifier should
be used with in-kernel irqchip") from the kvm tree.

Just a context change.  I fixed it up (taking the kvm tree's removal of
the first argument of kvm_unregister_irq_ack_notifier).
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/