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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  arch/arm64/include/asm/mte.h

between commit:

  013bb59dbb7c ("arm64: mte: handle tags zeroing at page allocation time")

from the arm64 tree and commit:

  69e3b846d8a7 ("arm64: mte: Sync tags for pages where PTE is untagged")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/include/asm/mte.h
index 67bf259ae768,347ef38a35f7..000000000000
--- a/arch/arm64/include/asm/mte.h
+++ b/arch/arm64/include/asm/mte.h
@@@ -37,8 -37,7 +37,8 @@@ void mte_free_tag_storage(char *storage
  /* track which pages have valid allocation tags */
  #define PG_mte_tagged	PG_arch_2
  
 +void mte_zero_clear_page_tags(void *addr);
- void mte_sync_tags(pte_t *ptep, pte_t pte);
+ void mte_sync_tags(pte_t old_pte, pte_t pte);
  void mte_copy_page_tags(void *kto, const void *kfrom);
  void mte_thread_init_user(void);
  void mte_thread_switch(struct task_struct *next);
@@@ -54,10 -53,7 +54,10 @@@ int mte_ptrace_copy_tags(struct task_st
  /* unused if !CONFIG_ARM64_MTE, silence the compiler */
  #define PG_mte_tagged	0
  
 +static inline void mte_zero_clear_page_tags(void *addr)
 +{
 +}
- static inline void mte_sync_tags(pte_t *ptep, pte_t pte)
+ static inline void mte_sync_tags(pte_t old_pte, pte_t pte)
  {
  }
  static inline void mte_copy_page_tags(void *kto, const void *kfrom)

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