Thanks Stephen, it was (obviously) the right fix. -Christoffer
On Wed, Nov 26, 2014 at 7:19 AM, Stephen Rothwell <[email protected]> wrote: > 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 [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
