From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 May 2018 17:24:03 +0000 (-0700)
Subject: Merge tag 'powerpc-4.17-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: Ubuntu-5.0.0-8.9~2450
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2c71d338bef2cc8a2e5f8ebe70788eeff246fcd8;p=mirror_ubuntu-disco-kernel.git

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
---

2c71d338bef2cc8a2e5f8ebe70788eeff246fcd8