Merge tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:

 - added support for Nintendo N64

 - added support for Realtek RTL83XX SoCs

 - kaslr support for Loongson64

 - first steps to get rid of set_fs()

 - DMA runtime coherent/non-coherent selection cleanup

 - cleanups and fixes

* tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (98 commits)
  Revert "MIPS: Add basic support for ptrace single step"
  vmlinux.lds.h: catch more UBSAN symbols into .data
  MIPS: kernel: Drop kgdb_call_nmi_hook
  MAINTAINERS: Add git tree for KVM/mips
  MIPS: Use common way to parse elfcorehdr
  MIPS: Simplify EVA cache handling
  Revert "MIPS: kernel: {ftrace,kgdb}: Set correct address limit for cache flushes"
  MIPS: remove CONFIG_DMA_PERDEV_COHERENT
  MIPS: remove CONFIG_DMA_MAYBE_COHERENT
  driver core: lift dma_default_coherent into common code
  MIPS: refactor the runtime coherent vs noncoherent DMA indicators
  MIPS/alchemy: factor out the DMA coherent setup
  MIPS/malta: simplify plat_setup_iocoherency
  MIPS: Add basic support for ptrace single step
  MAINTAINERS: replace non-matching patterns for loongson{2,3}
  MIPS: Make check condition for SDBBP consistent with EJTAG spec
  mips: Replace lkml.org links with lore
  Revert "MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op"
  MIPS: crash_dump.c: Simplify copy_oldmem_page()
  Revert "mips: Manually call fdt_init_reserved_mem() method"
  ...

diff --cc .mailmap
index 7fdf87b24fe84f37c1f3eddf13341d2a199f80d9,d942f9493a472770163c8dbe6d15d3cd15d6174a..ade90fc9140a2787fbb7e5d4799d79e49ba245b0
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -202,8 -200,7 +202,9 @@@ Li Yang <leoyang.li@nxp.com> <leoli@fre
  Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
  Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
  Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
+ Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>
 +Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
 +Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
  Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
  Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
  Mark Brown <broonie@sirena.org.uk>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/Kconfig
index 465bc5425d4cdbc2bd240b36932c73f69236d474,47715cbaf8104caab52212e522c2ee3837a508e7..d89efba3d8a44a9f861b35b9f8f7b47c9605e7fd
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -74,7 -75,10 +75,9 @@@ config MIP
        select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_NMI
 -      select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
+       select HAVE_PERF_REGS
+       select HAVE_PERF_USER_STACK_DUMP
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_RSEQ
        select HAVE_SPARSE_SYSCALL_NR

diff --cc arch/mips/Makefile
Simple merge

diff --cc arch/mips/include/asm/Kbuild
index 95b4fa7bd0d1fd92abf55f85f4d8a35379359416,9040ff0b3a149633c0d86b66967cb28714a412fb..8f6fe69674b71f3b8c01d2f3c467c83f4ede6d27
--- 1/arch/mips/include/asm/Kbuild
--- 2/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@@ -4,8 -4,13 +4,12 @@@ generated-y += syscall_table_32_o32.
  generated-y += syscall_table_64_n32.h
  generated-y += syscall_table_64_n64.h
  generated-y += syscall_table_64_o32.h
+ generated-y += unistd_nr_n32.h
+ generated-y += unistd_nr_n64.h
+ generated-y += unistd_nr_o32.h
+ 
  generic-y += export.h
  generic-y += kvm_para.h
 -generic-y += local64.h
  generic-y += mcs_spinlock.h
  generic-y += parport.h
  generic-y += qrwlock.h

diff --cc arch/mips/kernel/Makefile
Simple merge

diff --cc arch/mips/kernel/relocate.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge