Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  arch/arm64/include/asm/el2_setup.h

between commit:

  ca88ecdce5f5 ("arm64: Revamp HCR_EL2.E2H RES1 detection")

from Linus' tree and commit:

  96ac403ea2b4 ("arm64: Fix typos and spelling errors in comments")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/include/asm/el2_setup.h
index 99a7c0235e6d,cb0d72401d45..000000000000
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@@ -24,7 -24,11 +24,7 @@@
  	 * ID_AA64MMFR4_EL1.E2H0 < 0. On such CPUs HCR_EL2.E2H is RES1, but it
  	 * can reset into an UNKNOWN state and might not read as 1 until it has
  	 * been initialized explicitly.
- 	 * Initalize HCR_EL2.E2H so that later code can rely upon HCR_EL2.E2H
 -	 *
 -	 * Fruity CPUs seem to have HCR_EL2.E2H set to RAO/WI, but
 -	 * don't advertise it (they predate this relaxation).
 -	 *
+ 	 * Initialize HCR_EL2.E2H so that later code can rely upon HCR_EL2.E2H
  	 * indicating whether the CPU is running in E2H mode.
  	 */
  	mrs_s	x1, SYS_ID_AA64MMFR4_EL1