From: Michael Ellerman <mpe@ellerman.id.au>
Date: Tue, 9 Oct 2018 05:51:05 +0000 (+1100)
Subject: Merge branch 'fixes' into next
X-Git-Tag: v5.15~7724^2~130
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9b7e4d601baac83a7104652042107ce94f245524;p=mirror_ubuntu-kernels.git

Merge branch 'fixes' into next

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

9b7e4d601baac83a7104652042107ce94f245524
diff --cc tools/testing/selftests/powerpc/ptrace/Makefile
index 1ee59978508d,923d531265f8..9b35ca8e8f13
--- a/tools/testing/selftests/powerpc/ptrace/Makefile
+++ b/tools/testing/selftests/powerpc/ptrace/Makefile
@@@ -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)