From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Sep 2024 18:17:25 +0000 (-0700)
Subject: Merge tag 'powerpc-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4ffc45808373e32112500756d6f02fe56c42f371;p=linux.git

Merge tag 'powerpc-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:

 - Fix build error in vdso32 when building 64-bit with COMPAT=y and -Os

 - Fix build error in pseries EEH when CONFIG_DEBUG_FS is not set

Thanks to Christophe Leroy, Narayana Murty N, Christian Zigotzky, and
Ritesh Harjani.

* tag 'powerpc-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/pseries/eeh: move pseries_eeh_err_inject() outside CONFIG_DEBUG_FS block
  powerpc/vdso32: Fix use of crtsavres for PPC64
---

4ffc45808373e32112500756d6f02fe56c42f371