linux-next: manual merge of the kvm-arm tree with the arm64 tree

[Stephen Rothwell]

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/include/asm/sysreg.h
index f2e06e7c0a31,1972e4b9be5c..000000000000
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@@ -847,16 -847,17 +847,21 @@@
  #define ID_AA64MMFR0_ASID_SHIFT		4
  #define ID_AA64MMFR0_PARANGE_SHIFT	0
  
 -#define ID_AA64MMFR0_TGRAN4_NI		0xf
 -#define ID_AA64MMFR0_TGRAN4_SUPPORTED	0x0
 -#define ID_AA64MMFR0_TGRAN64_NI		0xf
 -#define ID_AA64MMFR0_TGRAN64_SUPPORTED	0x0
 -#define ID_AA64MMFR0_TGRAN16_NI		0x0
 -#define ID_AA64MMFR0_TGRAN16_SUPPORTED	0x1
 +#define ID_AA64MMFR0_TGRAN4_NI			0xf
 +#define ID_AA64MMFR0_TGRAN4_SUPPORTED_MIN	0x0
 +#define ID_AA64MMFR0_TGRAN4_SUPPORTED_MAX	0x7
 +#define ID_AA64MMFR0_TGRAN64_NI			0xf
 +#define ID_AA64MMFR0_TGRAN64_SUPPORTED_MIN	0x0
 +#define ID_AA64MMFR0_TGRAN64_SUPPORTED_MAX	0x7
 +#define ID_AA64MMFR0_TGRAN16_NI			0x0
 +#define ID_AA64MMFR0_TGRAN16_SUPPORTED_MIN	0x1
 +#define ID_AA64MMFR0_TGRAN16_SUPPORTED_MAX	0xf
 +
+ #define ID_AA64MMFR0_PARANGE_32		0x0
+ #define ID_AA64MMFR0_PARANGE_36		0x1
+ #define ID_AA64MMFR0_PARANGE_40		0x2
+ #define ID_AA64MMFR0_PARANGE_42		0x3
+ #define ID_AA64MMFR0_PARANGE_44		0x4
  #define ID_AA64MMFR0_PARANGE_48		0x5
  #define ID_AA64MMFR0_PARANGE_52		0x6
  
@@@ -1032,16 -1035,19 +1039,19 @@@
  
  #if defined(CONFIG_ARM64_4K_PAGES)
  #define ID_AA64MMFR0_TGRAN_SHIFT		ID_AA64MMFR0_TGRAN4_SHIFT
+ #define ID_AA64MMFR0_TGRAN_2_SHIFT		ID_AA64MMFR0_TGRAN4_2_SHIFT
 -#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_TGRAN4_SUPPORTED
 -#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX	0x7
 +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_TGRAN4_SUPPORTED_MIN
 +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX	ID_AA64MMFR0_TGRAN4_SUPPORTED_MAX
  #elif defined(CONFIG_ARM64_16K_PAGES)
  #define ID_AA64MMFR0_TGRAN_SHIFT		ID_AA64MMFR0_TGRAN16_SHIFT
+ #define ID_AA64MMFR0_TGRAN_2_SHIFT		ID_AA64MMFR0_TGRAN16_2_SHIFT
 -#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_TGRAN16_SUPPORTED
 -#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX	0xF
 +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_TGRAN16_SUPPORTED_MIN
 +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX	ID_AA64MMFR0_TGRAN16_SUPPORTED_MAX
  #elif defined(CONFIG_ARM64_64K_PAGES)
  #define ID_AA64MMFR0_TGRAN_SHIFT		ID_AA64MMFR0_TGRAN64_SHIFT
+ #define ID_AA64MMFR0_TGRAN_2_SHIFT		ID_AA64MMFR0_TGRAN64_2_SHIFT
 -#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_TGRAN64_SUPPORTED
 -#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX	0x7
 +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_TGRAN64_SUPPORTED_MIN
 +#define ID_AA64MMFR0_TGRAN_SUPPORTED_MAX	ID_AA64MMFR0_TGRAN64_SUPPORTED_MAX
  #endif
  
  #define MVFR2_FPMISC_SHIFT		4

Attachment: pgpOOIGxRZg82.pgp
Description: OpenPGP digital signature