linux-next: manual merge of the kvm-arm tree with the kvm tree
From: Stephen Rothwell
Date: Thu Sep 25 2014 - 01:32:24 EST
Today's linux-next merge of the kvm-arm tree got a conflict in
virt/kvm/eventfd.c between commit 29f1b65b5984 ("KVM: EVENTFD: Remove
inclusion of irq.h") from the kvm tree and commit 0ba09511ddc3 ("KVM:
EVENTFD: remove inclusion of irq.h") from the kvm-arm tree.
I fixed it up (I used the kvm tree version) and can carry the fix as
necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature