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

* for-next/misc:
  : Miscellaneous patches
  arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
  kasan: arm64: set TCR_EL1.TBID1 when enabled
  arm64: mte: optimize asynchronous tag check fault flag check
  arm64/mm: add fallback option to allocate virtually contiguous memory
  arm64/smp: Drop the macro S(x,s)
  arm64: consistently use reserved_pg_dir
  arm64: kprobes: Remove redundant kprobe_step_ctx

# Conflicts:
#	arch/arm64/kernel/vmlinux.lds.S

diff --cc arch/arm64/include/asm/asm-uaccess.h
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

diff --cc arch/arm64/include/asm/uaccess.h
Simple merge

diff --cc arch/arm64/kernel/entry.S
Simple merge

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

diff --cc arch/arm64/kernel/vmlinux.lds.S
index 94a08e3,746afbc..5d5857c
--- 1/arch/arm64/kernel/vmlinux.lds.S
--- 2/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@@ -201,7 -199,7 +199,7 @@@ SECTION
                INIT_CALLS
                CON_INITCALL
                INIT_RAM_FS
-               *(.init.altinstructions .init.rodata.* .init.bss)       /* from the EFI stub */
 -              *(.init.bss)    /* from the EFI stub */
++              *(.init.altinstructions .init.bss)      /* from the EFI stub */
        }
        .exit.data : {
                EXIT_DATA

diff --cc arch/arm64/mm/mmu.c
Simple merge

diff --cc arch/arm64/mm/proc.S
Simple merge