Merge branch 'for-next/misc' into for-next/core
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 9 Dec 2020 18:04:48 +0000 (18:04 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 9 Dec 2020 18:04:48 +0000 (18:04 +0000)
commitba4259a6f87a4d7b5039673569db06b6d8b74cf3
treeca880ae0a2f555ee49b572c97703ad6a9da9fcff
parente0f7a8d5e87f31da15a80fcf038f6296bae26f38
parent344f2db2a18af45faafce13133c84c4f076876a6
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
arch/arm64/include/asm/asm-uaccess.h
arch/arm64/include/asm/pgtable.h
arch/arm64/include/asm/uaccess.h
arch/arm64/kernel/entry.S
arch/arm64/kernel/setup.c
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/mm/mmu.c
arch/arm64/mm/proc.S