On Mon, Feb 22, 2016 at 01:33:22PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/kvm/hyp.S
>
> between commit:
>
> a0bf9776cd0b ("arm64: kvm: deal with kernel symbols outside of linear mapping")
>
> from the arm64 tree and commit:
>
> 253dcab4c363 ("arm64: KVM: VHE: Patch out use of HVC")
>
> from the kvm-arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This looks correct as well. Thanks.
--
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
