On Thu, Aug 19, 2021 at 02:05:44PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/sysreg.h
>
> between commit:
>
> 79d82cbcbb3d ("arm64/kexec: Test page size support with new TGRAN range values")
>
> from the arm64 tree and commit:
>
> 504c6295b998 ("arm64/mm: Add remaining ID_AA64MMFR0_PARANGE_ macros")
>
> from the kvm-arm 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.
This looks fine. Thanks Stephen.
--
Catalin
