Hi Stephen,
On Mon, Feb 22, 2016 at 01:28:29PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/cpufeature.h
> arch/arm64/kernel/cpufeature.c
>
> between commit:
>
> d5370f754875 ("arm64: prefetch: add alternative pattern for CPUs without a prefetcher")
> 57f4959bad0a ("arm64: kernel: Add support for User Access Override")
> 705441960033 ("arm64: kernel: Don't toggle PAN on systems with UAO")
>
> from the arm64 tree and commit:
>
> d0be74f771d5 ("arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature")
>
> from the kvm-arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fix-up looks correct indeed. 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
