Merge v5.6-rc2 into drm-misc-next

Lyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-next
forward yet, so it looks like a good occasion.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

1 files changed, 0 insertions, 31 deletions

diff --git a/tools/perf/lib/tests/test-threadmap.c b/tools/perf/lib/tests/test-threadmap.c
deleted file mode 100644
index 7dc4d6fbedde..000000000000
--- a/tools/perf/lib/tests/test-threadmap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <stdarg.h>
-#include <stdio.h>
-#include <perf/threadmap.h>
-#include <internal/tests.h>
-
-static int libperf_print(enum libperf_print_level level,
-			 const char *fmt, va_list ap)
-{
-	return vfprintf(stderr, fmt, ap);
-}
-
-int main(int argc, char **argv)
-{
-	struct perf_thread_map *threads;
-
-	__T_START;
-
-	libperf_init(libperf_print);
-
-	threads = perf_thread_map__new_dummy();
-	if (!threads)
-		return -1;
-
-	perf_thread_map__get(threads);
-	perf_thread_map__put(threads);
-	perf_thread_map__put(threads);
-
-	__T_END;
-	return 0;
-}