From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 7 Nov 2017 09:30:18 +0000 (+0100)
Subject: Merge branch 'linus' into perf/core, to fix conflicts
X-Git-Tag: v4.15-rc1~160^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=15bcdc9477b03eb035052412c3a087e11e855e76;p=linux.git

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

15bcdc9477b03eb035052412c3a087e11e855e76
diff --cc tools/perf/arch/arm/annotate/instructions.c
index 6dfec7c23696,b39b16395aac..f64516d5b23e
--- a/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 a2c32be4132a,9a3e0523e2c9..6688977e4ac7
--- a/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 b6b0ef5952d0,b7bc04980fe8..a3f423c27cae
--- a/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 b8676ccbed76,c9a81673e8aa..e0e466c650df
--- a/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/ui/tui/progress.c
index 68f6144ea603,236bcb620ae4..bc134b82829d
--- a/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/event.c
index 3c411e7e36aa,fc690fecbfd6..97a8ef9980db
--- a/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/zlib.c
index 7c1175310a12,008fe68d7b76..a725b958cf31
--- a/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>