From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Feb 2021 20:18:21 +0000 (-0800)
Subject: Merge tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Tag: accepted/tizen/unified/20230118.172025~7732
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6525b999970466b548d41e73d3b814233fa42ca;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mips_5.12_1' of git://git./linux/kernel/git/mips/linux

Pull more MIPS updates from Thomas Bogendoerfer:

 - added n64 block driver

 - fix for ubsan warnings

 - fix for bcm63xx platform

 - update of linux-mips mailinglist

* tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  arch: mips: update references to current linux-mips list
  mips: bmips: init clocks earlier
  vmlinux.lds.h: catch even more instrumentation symbols into .data
  n64: store dev instance into disk private data
  n64: cleanup n64cart_probe()
  n64: cosmetics changes
  n64: remove curly brackets
  n64: use sector SECTOR_SHIFT instead 512
  n64: use enums for reg
  n64: move module param at the top
  n64: move module info at the end
  n64: use pr_fmt to avoid duplicate string
  block: Add n64 cart driver
---

a6525b999970466b548d41e73d3b814233fa42ca
diff --cc include/asm-generic/vmlinux.lds.h
index fbc0ca8,ecfb54e..6786f8c
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -96,9 -93,9 +96,9 @@@
   * RODATA_MAIN is not used because existing code already defines .rodata.x
   * sections to be brought in with rodata.
   */
 -#ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
 +#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG)
  #define TEXT_MAIN .text .text.[0-9a-zA-Z_]*
- #define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$Lubsan_*
+ #define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$L*
  #define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*
  #define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]* .rodata..L*
  #define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..compoundliteral*