Merge branch 'for-next/mte' into for-next/core

* for-next/mte:
  docs: sysfs-devices-system-cpu: document "asymm" value for mte_tcf_preferred
  arm64/mte: Remove asymmetric mode from the prctl() interface
  kasan: fix a missing header include of static_keys.h
  arm64/mte: Add userspace interface for enabling asymmetric mode
  arm64/mte: Add hwcap for asymmetric mode
  arm64/mte: Add a little bit of documentation for mte_update_sctlr_user()
  arm64/mte: Document ABI for asymmetric mode
  arm64: mte: avoid clearing PSTATE.TCO on entry unless necessary
  kasan: split kasan_*enabled() functions into a separate header

diff --cc Documentation/arm64/memory-tagging-extension.rst
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/entry.S
index eb59621,e1013a8..a3ee79b
--- 1/arch/arm64/kernel/entry.S
--- 2/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@@ -308,15 -307,7 +308,8 @@@ alternative_if ARM64_HAS_IRQ_PRIO_MASKI
        mov     x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET
        msr_s   SYS_ICC_PMR_EL1, x20
  alternative_else_nop_endif
 +#endif
  
-       /* Re-enable tag checking (TCO set on exception entry) */
- #ifdef CONFIG_ARM64_MTE
- alternative_if ARM64_MTE
-       SET_PSTATE_TCO(0)
- alternative_else_nop_endif
- #endif
- 
        /*
         * Registers that may be useful after this macro is invoked:
         *