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

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 3707 bytes --]

Hi all,

Today's linux-next merge of the kvm-arm tree got conflicts in:

  arch/arm64/include/asm/sysreg.h
  arch/arm64/include/asm/ptrace.h

between commit:

  eab76a8e18803 ("arm64: Remove all usage of CONFIG_CPU_BIG_ENDIAN")

from the arm64 tree and commit:

  c7e18ba462536 ("arm64: Share arm64 headers with s390")

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.

diff --cc arch/arm64/include/asm/ptrace.h
index bd291bd6cfac7,4d88ed5cc4259..0000000000000
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@@ -66,6 -68,14 +68,8 @@@
  #define PSR_AA32_IT_MASK	0x0600fc00	/* If-Then execution state mask */
  #define PSR_AA32_GE_MASK	0x000f0000
  
+ #endif /* ARM64_S390_COMMON == 1 */
+ 
 -#ifdef CONFIG_CPU_BIG_ENDIAN
 -#define PSR_AA32_ENDSTATE	PSR_AA32_E_BIT
 -#else
 -#define PSR_AA32_ENDSTATE	0
 -#endif
 -
  /* AArch32 CPSR bits, as seen in AArch32 */
  #define COMPAT_PSR_DIT_BIT	0x00200000
  
diff --cc arch/arm64/include/asm/sysreg.h
index cec36606f6a43,b4f5dedff5ae8..0000000000000
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@@ -826,27 -838,43 +829,30 @@@
  #define SCTLR_ELx_A	 (BIT(1))
  #define SCTLR_ELx_M	 (BIT(0))
  
+ #endif /* ARM64_S390_COMMON == 1 */
+ 
 -#ifdef CONFIG_CPU_BIG_ENDIAN
 -#define ENDIAN_SET_EL2		SCTLR_ELx_EE
 -#else
 -#define ENDIAN_SET_EL2		0
 -#endif
 -
  #define INIT_SCTLR_EL2_MMU_ON						\
  	(SCTLR_ELx_M  | SCTLR_ELx_C | SCTLR_ELx_SA | SCTLR_ELx_I |	\
 -	 SCTLR_ELx_IESB | SCTLR_ELx_WXN | ENDIAN_SET_EL2 |		\
 -	 SCTLR_ELx_ITFSB | SCTLR_ELx_EIS | SCTLR_ELx_EOS | SCTLR_EL2_RES1)
 +	 SCTLR_ELx_IESB | SCTLR_ELx_WXN | SCTLR_ELx_ITFSB |		\
 +	 SCTLR_ELx_EIS | SCTLR_ELx_EOS | SCTLR_EL2_RES1)
  
 -#define INIT_SCTLR_EL2_MMU_OFF \
 -	(SCTLR_EL2_RES1 | ENDIAN_SET_EL2)
 +#define INIT_SCTLR_EL2_MMU_OFF	(SCTLR_EL2_RES1)
  
  /* SCTLR_EL1 specific flags. */
 -#ifdef CONFIG_CPU_BIG_ENDIAN
 -#define ENDIAN_SET_EL1		(SCTLR_EL1_E0E | SCTLR_ELx_EE)
 -#else
 -#define ENDIAN_SET_EL1		0
 -#endif
 -
  #define INIT_SCTLR_EL1_MMU_OFF \
 -	(ENDIAN_SET_EL1 | SCTLR_EL1_LSMAOE | SCTLR_EL1_nTLSMD | \
 -	 SCTLR_EL1_EIS  | SCTLR_EL1_TSCXT  | SCTLR_EL1_EOS)
 +	(SCTLR_EL1_LSMAOE | SCTLR_EL1_nTLSMD | SCTLR_EL1_EIS  |		\
 +	 SCTLR_EL1_TSCXT  | SCTLR_EL1_EOS)
  
  #define INIT_SCTLR_EL1_MMU_ON \
 -	(SCTLR_ELx_M      | SCTLR_ELx_C      | SCTLR_ELx_SA    | \
 -	 SCTLR_EL1_SA0    | SCTLR_EL1_SED    | SCTLR_ELx_I     | \
 -	 SCTLR_EL1_DZE    | SCTLR_EL1_UCT    | SCTLR_EL1_nTWE  | \
 -	 SCTLR_ELx_IESB   | SCTLR_EL1_SPAN   | SCTLR_ELx_ITFSB | \
 -	 ENDIAN_SET_EL1   | SCTLR_EL1_UCI    | SCTLR_EL1_EPAN  | \
 -	 SCTLR_EL1_LSMAOE | SCTLR_EL1_nTLSMD | SCTLR_EL1_EIS   | \
 -	 SCTLR_EL1_TSCXT  | SCTLR_EL1_EOS)
 +	(SCTLR_ELx_M      | SCTLR_ELx_C      | SCTLR_ELx_SA     | \
 +	 SCTLR_EL1_SA0    | SCTLR_EL1_SED    | SCTLR_ELx_I      | \
 +	 SCTLR_EL1_DZE    | SCTLR_EL1_UCT    | SCTLR_EL1_nTWE   | \
 +	 SCTLR_ELx_IESB   | SCTLR_EL1_SPAN   | SCTLR_ELx_ITFSB  | \
 +	 SCTLR_EL1_UCI    | SCTLR_EL1_EPAN   | SCTLR_EL1_LSMAOE | \
 +	 SCTLR_EL1_nTLSMD | SCTLR_EL1_EIS    | SCTLR_EL1_TSCXT  | \
 +	 SCTLR_EL1_EOS)
  
+ #if ARM64_S390_COMMON == 1
  /* MAIR_ELx memory attributes (used by Linux) */
  #define MAIR_ATTR_DEVICE_nGnRnE		UL(0x00)
  #define MAIR_ATTR_DEVICE_nGnRE		UL(0x04)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]