Messages in this thread | | | Date | Wed, 26 Nov 2014 17:19:14 +1100 | 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 arch/ia64/kvm/kvm-ia64.c between commit 003f7de62589 ("KVM: ia64: remove") from the kvm tree and commit bf4bea8e9a90 ("kvm: fix kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn()") from the kvm-arm tree.
I fixed it up (the former removed the file, so I did that) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |