Merge remote-tracking branch 'xtensa/master'

Conflicts:
	arch/xtensa/configs/iss_defconfig

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc arch/xtensa/boot/Makefile
Simple merge

diff --cc arch/xtensa/include/asm/coprocessor.h
index 75c94a1658b02b81b14ec3759c5f29cb8db97a4d,04bc285df1a7939ddb513dd5e9a4abff1ea9d869..42da613d16238f5c6660faa1acc5c20bac97ebca
--- 1/arch/xtensa/include/asm/coprocessor.h
--- 2/arch/xtensa/include/asm/coprocessor.h
+++ b/arch/xtensa/include/asm/coprocessor.h
@@@ -13,11 -13,11 +13,12 @@@
  #define _XTENSA_COPROCESSOR_H
  
  #include <linux/stringify.h>
 +#include <variant/core.h>
  #include <variant/tie.h>
+ #include <variant/core.h>
  #include <asm/types.h>
  
- #ifdef __ASSEMBLY__
+ #if defined(__ASSEMBLY__) && !defined(LINKER_SCRIPT)
  # include <variant/tie-asm.h>
  
  .macro        xchal_sa_start  a b

diff --cc arch/xtensa/kernel/time.c
Simple merge