From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Nov 2025 17:44:50 +0000 (-0800)
Subject: Merge tag 'riscv-for-linus-6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.18-rc7~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6ff0d85ebf0d4033c9850bf7f77fdaf472191a1;p=thirdparty%2Flinux.git

Merge tag 'riscv-for-linus-6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull RISC-V fixes from Paul Walmsley:

 - Correct the MIPS RISC-V/JEDEC vendor ID

 - Fix the system shutdown behavior in the legacy case where
   CONFIG_RISCV_SBI_V01 is set, but the firmware implementation
   doesn't support the older v0.1 system shutdown method

 - Align some tools/ macro definitions with the corresponding
   kernel headers

* tag 'riscv-for-linus-6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  tools: riscv: Fixed misalignment of CSR related definitions
  riscv: sbi: Prefer SRST shutdown over legacy
  riscv: Update MIPS vendor id to 0x127
---

a6ff0d85ebf0d4033c9850bf7f77fdaf472191a1