From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Sep 2022 18:00:45 +0000 (-0400)
Subject: Merge tag 'powerpc-6.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: microblaze-v6.2~325
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2fc1171d34deff70bf3a8338adab8ce46138aae3;p=linux-2.6-microblaze.git

Merge tag 'powerpc-6.0-5' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:

 - Fix crashes on bare metal due to the new plkps driver trying to probe
   and call the hypervisor on non-pseries machines.

Thanks to Nathan Chancellor and Dan Horák.

* tag 'powerpc-6.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/pseries: Fix plpks crash on non-pseries
---

2fc1171d34deff70bf3a8338adab8ce46138aae3