From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 9 Dec 2020 18:04:48 +0000 (+0000)
Subject: Merge branch 'for-next/misc' into for-next/core
X-Git-Tag: v5.15~2121^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba4259a6f87a4d7b5039673569db06b6d8b74cf3;p=platform%2Fkernel%2Flinux-starfive.git

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
---

ba4259a6f87a4d7b5039673569db06b6d8b74cf3
diff --cc arch/arm64/kernel/vmlinux.lds.S
index 94a08e3,746afbc..5d5857c
--- a/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