From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2021 17:40:41 +0000 (-0700)
Subject: Merge tag 'powerpc-5.14-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6602
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f73eacde73b105d722968e79d0f84fd5034a6f4;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'powerpc-5.14-7' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:

 - Fix scv implicit soft-mask table for relocated (eg. kdump) kernels

 - Re-enable ARCH_ENABLE_SPLIT_PMD_PTLOCK, which was disabled due to a
   typo

Thanks to Lukas Bulwahn, Nicholas Piggin, and Daniel Axtens.

* tag 'powerpc-5.14-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Fix scv implicit soft-mask table for relocated kernels
  powerpc: Re-enable ARCH_ENABLE_SPLIT_PMD_PTLOCK
---

9f73eacde73b105d722968e79d0f84fd5034a6f4