linux-next: manual merge of the kspp tree with the arm64 tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/kernel/alternative.c

between commit:

  8d144746ecc5 ("arm64: alternative: simplify passing alt_region")

from the arm64 tree and commit:

  9562f3dc6f50 ("arm64: add __nocfi to __apply_alternatives")

from the kspp 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/kernel/alternative.c
index f6fd16185040,abc84636af07..000000000000
--- a/arch/arm64/kernel/alternative.c
+++ b/arch/arm64/kernel/alternative.c
@@@ -133,10 -133,11 +133,10 @@@ static void clean_dcache_range_nopatch(
  	} while (cur += d_size, cur < end);
  }
  
- static void __apply_alternatives(struct alt_region *region, bool is_module,
- 				 unsigned long *feature_mask)
 -static void __nocfi __apply_alternatives(void *alt_region,  bool is_module,
++static void __nocfi __apply_alternatives(struct alt_region *region, bool is_module,
+ 					 unsigned long *feature_mask)
  {
  	struct alt_instr *alt;
 -	struct alt_region *region = alt_region;
  	__le32 *origptr, *updptr;
  	alternative_cb_t alt_cb;

Attachment: pgpUndcfPNmFF.pgp
Description: OpenPGP digital signature