From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jan 2024 19:20:50 +0000 (-0800)
Subject: Merge tag 'mips_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=096f286ee3fadf3f6777dedba35fa66654ec9f34;p=linux.git

Merge tag 'mips_6.8' of git://git./linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:
 "Just cleanups and fixes"

* tag 'mips_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup()
  MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup()
  MIPS: Fix typos
  MIPS: Remove unused shadow GPR support from vector irq setup
  MIPS: Allow vectored interrupt handler to reside everywhere for 64bit
  mips: Set dump-stack arch description
  mips: mm: add slab availability checking in ioremap_prot
  mips: Optimize max_mapnr init procedure
  mips: Fix max_mapnr being uninitialized on early stages
  mips: Fix incorrect max_low_pfn adjustment
  mips: dmi: Fix early remap on MIPS32
  MIPS: compressed: Use correct instruction for 64 bit code
  MIPS: SGI-IP27: hubio: fix nasid kernel-doc warning
  MAINTAINERS: Add myself as maintainer of the Ralink architecture
---

096f286ee3fadf3f6777dedba35fa66654ec9f34
diff --cc arch/mips/kernel/traps.c
index c58c0c3c5b40c,0e3f2f2fa732b..dec6878b35f62
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@@ -2152,11 -2120,8 +2120,6 @@@ void *set_vi_handler(int n, vi_handler_
  	return (void *)old_handler;
  }
  
- void *set_vi_handler(int n, vi_handler_t addr)
- {
- 	return set_vi_srs_handler(n, addr, 0);
- }
 -extern void tlb_init(void);
--
  /*
   * Timer interrupt
   */