Hi Stephen,
On Tue, Nov 22, 2016 at 10:34:58AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/include/asm/cpufeature.h
>
> between commit:
>
> 272d01bd790f ("arm64: Fix circular include of asm/lse.h through
> linux/jump_label.h")
>
> from Linus' tree and commits:
>
> a4023f682739 ("arm64: Add hypervisor safe helper for checking constant
> capabilities")
> 82e0191a1aa1 ("arm64: Support systems without FP/ASIMD")
>
> from the arm64 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
The merge resolution and additional patch look fine. Thanks.
--
Catalin
