]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'powerpc-5.14-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2021 17:40:41 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2021 17:40:41 +0000 (10:40 -0700)
commitf7aca8b9a526636684485f4251dc2e2cb31d3a51
tree781974492c632c2c4f66bf24686ac312858008a4
parent543d96ebb6a0f74e7d88ffda32d1e3df0965723f
parent559f8d80aaac2b92b15381c68751817698c1aa78
Merge tag 'powerpc-5.14-7' of git://git.kernel.org/pub/scm/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