diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 19:24:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 19:24:03 +0200 |
| commit | 2c71d338bef2cc8a2e5f8ebe70788eeff246fcd8 (patch) | |
| tree | 27614afca1a4f8b966124ed01586189ab7331889 /drivers/ps3 | |
| parent | Merge tag 'acpi-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| parent | powerpc/powernv: Fix NVRAM sleep in invalid context when crashing (diff) | |
| download | linux-2c71d338bef2cc8a2e5f8ebe70788eeff246fcd8.tar.xz linux-2c71d338bef2cc8a2e5f8ebe70788eeff246fcd8.zip | |
Merge tag 'powerpc-4.17-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"Just three commits.
The two cxl ones are not fixes per se, but they modify code that was
added this cycle so that it will work with a recent firmware change.
And then a fix for a recent commit that added sleeps in the NVRAM
code, which needs to be more careful and not sleep if eg. we're called
in the panic() path.
Thanks to Nicholas Piggin, Philippe Bergheaud, Christophe Lombard"
* tag 'powerpc-4.17-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/powernv: Fix NVRAM sleep in invalid context when crashing
cxl: Report the tunneled operations status
cxl: Set the PBCQ Tunnel BAR register when enabling capi mode
Diffstat (limited to 'drivers/ps3')
0 files changed, 0 insertions, 0 deletions