[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the kvm-arm tree with the kvm tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2014-11-26 6:19:14
Message-ID: 20141126171914.19ad9151 () canb ! auug ! org ! au
[Download RAW message or body]

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).

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]