Subject: linux-next: manual merge of the arm64 tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Mar 2022 09:38:32 +1100

Hi all,

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

  arch/arm64/include/asm/sysreg.h

between commit:

  228a26b91228 ("arm64: Use the clearbhb instruction in mitigations")

from Linus' tree and commit:

  def8c222f054 ("arm64: Add support of PAuth QARMA3 architected algorithm")

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/sysreg.h
index 932d45b17877,2023a0e6c6d6..000000000000
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@@ -773,7 -773,8 +773,9 @@@
  #define ID_AA64ISAR1_GPI_IMP_DEF		0x1
  
  /* id_aa64isar2 */
 +#define ID_AA64ISAR2_CLEARBHB_SHIFT	28
+ #define ID_AA64ISAR2_APA3_SHIFT		12
+ #define ID_AA64ISAR2_GPA3_SHIFT		8
  #define ID_AA64ISAR2_RPRES_SHIFT	4
  #define ID_AA64ISAR2_WFXT_SHIFT		0