Merge b4.19-rc4 into char-misc-next

We want the bugfixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-09-16 22:41:47 +02:00
parent 7adb05bb81 7876320f88
commit f685fc6ab0
300 changed files with 2993 additions and 1745 deletions
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -144,7 +144,7 @@ enum perf_event_sample_format {

 	PERF_SAMPLE_MAX = 1U << 20,		/* non-ABI */

-	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63,
+	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63, /* non-ABI; internal use */
 };

 /*