diff options
author | 2021-08-28 10:40:41 -0700 | |
---|---|---|
committer | 2021-08-28 10:40:41 -0700 | |
commit | 9f73eacde73b105d722968e79d0f84fd5034a6f4 (patch) | |
tree | 781974492c632c2c4f66bf24686ac312858008a4 /drivers | |
parent | Merge tag 'block-5.14-2021-08-27' of git://git.kernel.dk/linux-block (diff) | |
parent | powerpc/64s: Fix scv implicit soft-mask table for relocated kernels (diff) | |
download | linux-9f73eacde73b105d722968e79d0f84fd5034a6f4.tar.gz linux-9f73eacde73b105d722968e79d0f84fd5034a6f4.tar.bz2 linux-9f73eacde73b105d722968e79d0f84fd5034a6f4.zip |
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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions