diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 23:57:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 23:57:54 +0300 |
| commit | 5ac447d268601f88264ad18a13e7177a455007bb (patch) | |
| tree | 8c13a8b158142a8ebb0db004fd2b9fb03f071174 /fs/nfs/flexfilelayout/flexfilelayout.c | |
| parent | ab2789b72df3cf7a01e30636ea86cbbf44ba2e99 (diff) | |
| parent | a093c92dc7f96a15de98ec8cfe38e6f7610a5969 (diff) | |
| download | linux-5ac447d268601f88264ad18a13e7177a455007bb.tar.xz | |
Merge tag 'powerpc-4.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"Three small fixes for recently merged code:
- remove a spurious WARN_ON when a PCI device has no of_node, it's
allowed in some circumstances for there to be no of_node.
- fix the offset for store EOI MMIOs in the XIVE interrupt
controller.
- fix non-const WARN_ONs which were becoming BUGs due to them losing
BUGFLAG_WARNING in a recent cleanup patch.
Thanks to: Alexey Kardashevskiy, Alistair Popple, Benjamin
Herrenschmidt"
* tag 'powerpc-4.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/debug: Add missing warn flag to WARN_ON's non-builtin path
powerpc/xive: Fix offset for store EOI MMIOs
powerpc/npu-dma: Remove spurious WARN_ON when a PCI device has no of_node
Diffstat (limited to 'fs/nfs/flexfilelayout/flexfilelayout.c')
0 files changed, 0 insertions, 0 deletions