Messages in this thread | | | Date | Thu, 25 Sep 2014 15:32:01 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm-arm tree with the kvm tree |
| |
Hi all,
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). git diff -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |