diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-27 09:28:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-27 09:28:34 -0700 |
| commit | 6f68a6ae1f0ea2fd87e26dc345866e928b5850a8 (patch) | |
| tree | c0e26127ab1236432b99eee29bac640896dbacb0 /net/ipv4/cipso_ipv4.c | |
| parent | 38e6bf238daa2514a543f76ec8d1cc0f488ac422 (diff) | |
| parent | a4700a26107241cc7b9ac8528b2c6714ff99983d (diff) | |
Merge tag 'powerpc-4.12-4' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
0 files changed, 0 insertions, 0 deletions