Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 9 Oct 2018 05:51:05 +0000 (16:51 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 9 Oct 2018 05:51:05 +0000 (16:51 +1100)
Merge our fixes branch. It has a few important fixes that are needed for
futher testing and also some commits that will conflict with content in
next.

1  2 
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/process.c
arch/powerpc/kernel/tm.S
tools/testing/selftests/powerpc/ptrace/Makefile

Simple merge
Simple merge
Simple merge
index 1ee59978508ddb24795f2b7f8441b7f9191178cc,923d531265f8c22d3adf2442e0a48fc7c1fffb5d..9b35ca8e8f13d4bbe77ba24d3e061031071c39c3
@@@ -2,8 -2,9 +2,9 @@@
  TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \
                ptrace-tar ptrace-tm-tar ptrace-tm-spd-tar ptrace-vsx ptrace-tm-vsx \
                ptrace-tm-spd-vsx ptrace-tm-spr ptrace-hwbreak ptrace-pkey core-pkey \
 -              perf-hwbreak
 +              perf-hwbreak ptrace-syscall
  
+ top_srcdir = ../../../../..
  include ../../lib.mk
  
  all: $(TEST_PROGS)