From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Oct 2025 17:09:55 +0000 (-0700)
Subject: Merge tag 'mips_6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a74422b9710e987c7d6b85a1ade7330b1e61626;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'mips_6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:

 - switch longson32 platform to DT and use MIPS_GENERIC framework

 - cleanups/fixes for lantiq DTs

 - other cleanups and fixes

* tag 'mips_6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits)
  mips: math-emu: replace deprecated strcpy() in me-debugfs
  MIPS: configs: Consolidate Loongson1 defconfigs
  MIPS: Unify Loongson1 PRID_REV
  MIPS: loongson32: Switch to generic core
  MIPS: loongson: Add built-in DTB support
  MIPS: dts: loongson: Add CQ-T300B board
  MIPS: dts: loongson: Add Smartloong-1C board
  MIPS: dts: loongson: Add LSGZ_1B_DEV board
  MIPS: dts: loongson: Add LS1B-DEMO board
  dt-bindings: mips: loongson: Add LS1B-DEMO and CQ-T300B
  mips: lantiq: danube: rename stp node on EASY50712 reference board
  mips: lantiq: xway: sysctrl: rename stp clock
  MIPS: RB532: Replace deprecated strcpy() with memcpy() and strscpy()
  MIPS: Loongson64: Replace deprecated strcpy() with strscpy_pad()
  MIPS: generic: Replace deprecated strcpy() in ocelot_detect()
  MIPS: octeon: Replace deprecated strcpy() in octeon_model_get_string_buffer()
  MIPS: octeon: Replace memset(0) + deprecated strcpy() with strscpy_pad()
  MIPS: arc: Replace deprecated strcpy() with memcpy()
  MIPS: txx9: Replace deprecated strcpy() with strscpy()
  MIPS: sni: Replace deprecated strcpy() in sni_console_setup()
  ...
---

6a74422b9710e987c7d6b85a1ade7330b1e61626
diff --cc MAINTAINERS
index 5a2cde903910,c6e6c9035d9b..8f5208ad442b
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -17267,10 -17016,11 +17267,11 @@@ M:	Keguang Zhang <keguang.zhang@gmail.c
  L:	linux-mips@vger.kernel.org
  S:	Maintained
  F:	Documentation/devicetree/bindings/*/loongson,ls1*.yaml
- F:	arch/mips/include/asm/mach-loongson32/
+ F:	arch/mips/boot/dts/loongson/loongson1*
+ F:	arch/mips/configs/loongson1_defconfig
  F:	arch/mips/loongson32/
  F:	drivers/*/*loongson1*
 -F:	drivers/mtd/nand/raw/loongson1-nand-controller.c
 +F:	drivers/mtd/nand/raw/loongson-nand-controller.c
  F:	drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
  F:	sound/soc/loongson/loongson1_ac97.c