Merge branch 'linus' into perf/core, to fix conflicts

Conflicts:
	tools/perf/arch/arm/annotate/instructions.c
	tools/perf/arch/arm64/annotate/instructions.c
	tools/perf/arch/powerpc/annotate/instructions.c
	tools/perf/arch/s390/annotate/instructions.c
	tools/perf/arch/x86/tests/intel-cqm.c
	tools/perf/ui/tui/progress.c
	tools/perf/util/zlib.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/kernel/kprobes/common.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc tools/include/linux/poison.h
Simple merge

diff --cc tools/perf/arch/arm/annotate/instructions.c
index 6dfec7c,b39b163..f64516d
--- 1/tools/perf/arch/arm/annotate/instructions.c
--- 2/tools/perf/arch/arm/annotate/instructions.c
+++ b/tools/perf/arch/arm/annotate/instructions.c
@@@ -1,4 -1,4 +1,5 @@@
+ // SPDX-License-Identifier: GPL-2.0
 +#include <linux/compiler.h>
  #include <sys/types.h>
  #include <regex.h>
  

diff --cc tools/perf/arch/arm64/annotate/instructions.c
index a2c32be,9a3e052..6688977
--- 1/tools/perf/arch/arm64/annotate/instructions.c
--- 2/tools/perf/arch/arm64/annotate/instructions.c
+++ b/tools/perf/arch/arm64/annotate/instructions.c
@@@ -1,4 -1,4 +1,5 @@@
+ // SPDX-License-Identifier: GPL-2.0
 +#include <linux/compiler.h>
  #include <sys/types.h>
  #include <regex.h>
  

diff --cc tools/perf/arch/powerpc/annotate/instructions.c
index b6b0ef5,b7bc049..a3f423c
--- 1/tools/perf/arch/powerpc/annotate/instructions.c
--- 2/tools/perf/arch/powerpc/annotate/instructions.c
+++ b/tools/perf/arch/powerpc/annotate/instructions.c
@@@ -1,5 -1,4 +1,6 @@@
+ // SPDX-License-Identifier: GPL-2.0
 +#include <linux/compiler.h>
 +
  static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, const char *name)
  {
        int i;

diff --cc tools/perf/arch/s390/annotate/instructions.c
index b8676cc,c9a8167..e0e466c
--- 1/tools/perf/arch/s390/annotate/instructions.c
--- 2/tools/perf/arch/s390/annotate/instructions.c
+++ b/tools/perf/arch/s390/annotate/instructions.c
@@@ -1,5 -1,4 +1,6 @@@
+ // SPDX-License-Identifier: GPL-2.0
 +#include <linux/compiler.h>
 +
  static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)
  {
        struct ins_ops *ops = NULL;

diff --cc tools/perf/arch/x86/annotate/instructions.c
Simple merge

diff --cc tools/perf/arch/x86/include/arch-tests.h
Simple merge

diff --cc tools/perf/arch/x86/tests/arch-tests.c
Simple merge

diff --cc tools/perf/builtin-annotate.c
Simple merge

diff --cc tools/perf/builtin-buildid-cache.c
Simple merge

diff --cc tools/perf/builtin-buildid-list.c
Simple merge

diff --cc tools/perf/builtin-c2c.c
Simple merge

diff --cc tools/perf/builtin-config.c
Simple merge

diff --cc tools/perf/builtin-diff.c
Simple merge

diff --cc tools/perf/builtin-evlist.c
Simple merge

diff --cc tools/perf/builtin-inject.c
Simple merge

diff --cc tools/perf/builtin-kmem.c
Simple merge

diff --cc tools/perf/builtin-kvm.c
Simple merge

diff --cc tools/perf/builtin-list.c
Simple merge

diff --cc tools/perf/builtin-lock.c
Simple merge

diff --cc tools/perf/builtin-mem.c
Simple merge

diff --cc tools/perf/builtin-record.c
Simple merge

diff --cc tools/perf/builtin-report.c
Simple merge

diff --cc tools/perf/builtin-sched.c
Simple merge

diff --cc tools/perf/builtin-script.c
Simple merge

diff --cc tools/perf/check-headers.sh
Simple merge

diff --cc tools/perf/perf.h
Simple merge

diff --cc tools/perf/pmu-events/jevents.h
Simple merge

diff --cc tools/perf/pmu-events/pmu-events.h
Simple merge

diff --cc tools/perf/tests/attr.c
Simple merge

diff --cc tools/perf/tests/attr.py
Simple merge

diff --cc tools/perf/tests/builtin-test.c
Simple merge

diff --cc tools/perf/tests/mmap-thread-lookup.c
Simple merge

diff --cc tools/perf/tests/topology.c
Simple merge

diff --cc tools/perf/trace/beauty/beauty.h
Simple merge

diff --cc tools/perf/trace/beauty/mmap.c
Simple merge

diff --cc tools/perf/ui/browsers/hists.c
Simple merge

diff --cc tools/perf/ui/progress.c
Simple merge

diff --cc tools/perf/ui/progress.h
Simple merge

diff --cc tools/perf/ui/stdio/hist.c
Simple merge

diff --cc tools/perf/ui/tui/progress.c
index 68f6144,236bcb6..bc134b8
--- 1/tools/perf/ui/tui/progress.c
--- 2/tools/perf/ui/tui/progress.c
+++ b/tools/perf/ui/tui/progress.c
@@@ -1,4 -1,4 +1,5 @@@
+ // SPDX-License-Identifier: GPL-2.0
 +#include <linux/kernel.h>
  #include "../cache.h"
  #include "../progress.h"
  #include "../libslang.h"

diff --cc tools/perf/util/annotate.c
Simple merge

diff --cc tools/perf/util/callchain.c
Simple merge

diff --cc tools/perf/util/callchain.h
Simple merge

diff --cc tools/perf/util/comm.c
Simple merge

diff --cc tools/perf/util/config.c
Simple merge

diff --cc tools/perf/util/data.c
Simple merge

diff --cc tools/perf/util/data.h
Simple merge

diff --cc tools/perf/util/debug.c
Simple merge

diff --cc tools/perf/util/dso.c
Simple merge

diff --cc tools/perf/util/dso.h
Simple merge

diff --cc tools/perf/util/event.c
index 3c411e7,fc690fe..97a8ef9
--- 1/tools/perf/util/event.c
--- 2/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@@ -1,6 -1,6 +1,7 @@@
+ // SPDX-License-Identifier: GPL-2.0
  #include <dirent.h>
  #include <errno.h>
 +#include <fcntl.h>
  #include <inttypes.h>
  #include <linux/kernel.h>
  #include <linux/types.h>

diff --cc tools/perf/util/event.h
Simple merge

diff --cc tools/perf/util/evlist.h
Simple merge

diff --cc tools/perf/util/evsel.h
Simple merge

diff --cc tools/perf/util/evsel_fprintf.c
Simple merge

diff --cc tools/perf/util/header.c
Simple merge

diff --cc tools/perf/util/hist.c
Simple merge

diff --cc tools/perf/util/jit.h
Simple merge

diff --cc tools/perf/util/jitdump.c
Simple merge

diff --cc tools/perf/util/machine.c
Simple merge

diff --cc tools/perf/util/machine.h
Simple merge

diff --cc tools/perf/util/map.c
Simple merge

diff --cc tools/perf/util/map.h
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

diff --cc tools/perf/util/parse-events.h
Simple merge

diff --cc tools/perf/util/parse-events.l
Simple merge

diff --cc tools/perf/util/pmu.c
Simple merge

diff --cc tools/perf/util/pmu.h
Simple merge

diff --cc tools/perf/util/print_binary.c
Simple merge

diff --cc tools/perf/util/print_binary.h
Simple merge

diff --cc tools/perf/util/rb_resort.h
Simple merge

diff --cc tools/perf/util/session.c
Simple merge

diff --cc tools/perf/util/session.h
Simple merge

diff --cc tools/perf/util/sort.c
Simple merge

diff --cc tools/perf/util/sort.h
Simple merge

diff --cc tools/perf/util/srcline.c
Simple merge

diff --cc tools/perf/util/srcline.h
Simple merge

diff --cc tools/perf/util/stat-shadow.c
Simple merge

diff --cc tools/perf/util/stat.c
Simple merge

diff --cc tools/perf/util/stat.h
Simple merge

diff --cc tools/perf/util/symbol.c
Simple merge

diff --cc tools/perf/util/symbol.h
Simple merge

diff --cc tools/perf/util/thread.c
Simple merge

diff --cc tools/perf/util/thread.h
Simple merge

diff --cc tools/perf/util/top.h
Simple merge

diff --cc tools/perf/util/util.c
Simple merge

diff --cc tools/perf/util/util.h
Simple merge

diff --cc tools/perf/util/vdso.c
Simple merge

diff --cc tools/perf/util/zlib.c
index 7c11753,008fe68..a725b95
--- 1/tools/perf/util/zlib.c
--- 2/tools/perf/util/zlib.c
+++ b/tools/perf/util/zlib.c
@@@ -1,4 -1,4 +1,5 @@@
+ // SPDX-License-Identifier: GPL-2.0
 +#include <fcntl.h>
  #include <stdio.h>
  #include <unistd.h>
  #include <sys/stat.h>