From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 May 2017 16:28:34 +0000 (-0700)
Subject: Merge tag 'powerpc-4.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: MMI-PSA29.97-13-9~5520
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f68a6ae1f0ea2fd87e26dc345866e928b5850a8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'powerpc-4.12-4' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "Fix running SPU programs on Cell, and a few other minor fixes.

  Thanks to Alistair Popple, Jeremy Kerr, Michael Neuling, Nicholas
  Piggin"

* tag 'powerpc-4.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructions
  powerpc/spufs: Fix hash faults for kernel regions
  powerpc: Fix booting P9 hash with CONFIG_PPC_RADIX_MMU=N
  powerpc/powernv/npu-dma.c: Fix opal_npu_destroy_context() call
  selftests/powerpc: Fix TM resched DSCR test with some compilers
---

6f68a6ae1f0ea2fd87e26dc345866e928b5850a8