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

[Mark Brown]

Hi all,

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

  arch/arm64/mm/pageattr.c

between commit:

  0d227834a51e9 ("Revert "arch: introduce set_direct_map_valid_noflush()"")

from the mm tree and commit:

  714153dca3a85 ("arm64: realm: Move Realm memory encryption ops to RSI code")

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.

diff --cc arch/arm64/mm/pageattr.c
index 132938b32eb16,14b2a3801f404..0000000000000
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@@ -272,12 -272,10 +272,10 @@@ int set_direct_map_default_noflush(stru
  		return 0;
  
  	return update_range_prot((unsigned long)page_address(page),
 -				 PAGE_SIZE, set_mask, clear_mask);
 +				 PAGE_SIZE * numpages, set_mask, clear_mask);
  }
  
- static int __set_memory_enc_dec(unsigned long addr,
- 				int numpages,
- 				bool encrypt)
+ int __set_memory_enc_dec(unsigned long addr, int numpages, bool encrypt)
  {
  	unsigned long set_prot = 0, clear_prot = 0;
  	phys_addr_t start, end;

Attachment: signature.asc
Description: PGP signature