Hi all,
On Mon, 23 Jul 2018 14:46:41 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/cpucaps.h
>
> between commit:
>
> 314d53d29798 ("arm64: Handle mismatched cache type")
>
> from the arm64 tree and commit:
>
> e48d53a91f6e ("arm64: KVM: Add support for Stage-2 control of memory types and cacheability")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/include/asm/cpucaps.h
> index be3bf3d08916,ed84d6536830..000000000000
> --- a/arch/arm64/include/asm/cpucaps.h
> +++ b/arch/arm64/include/asm/cpucaps.h
> @@@ -49,8 -49,8 +49,9 @@@
> #define ARM64_HAS_CACHE_DIC 28
> #define ARM64_HW_DBM 29
> #define ARM64_SSBD 30
> -#define ARM64_HAS_STAGE2_FWB 31
> +#define ARM64_MISMATCHED_CACHE_TYPE 31
> ++#define ARM64_HAS_STAGE2_FWB 32
>
> --#define ARM64_NCAPS 32
> ++#define ARM64_NCAPS 33
>
> #endif /* __ASM_CPUCAPS_H */
This is now a conflict between Linus' tree and the kvm-arm tree (and
presumably soon the kvm tree).
--
Cheers,
Stephen Rothwell
Attachment:
pgp4UDqEaj9oA.pgp
Description: OpenPGP digital signature
