Merge tag 'v3.12-rc4' into next

Merge with mainline to bring in changes to input subsystem that were
committed through other trees.

1 files changed, 22 insertions, 0 deletions

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 35b45f1466b5..1e67437fb4ca 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -93,6 +93,28 @@ static struct test {
                 .desc = "Test software clock events have valid period values",
                 .func = test__sw_clock_freq,
         },
+#if defined(__x86_64__) || defined(__i386__)
+        {
+                .desc = "Test converting perf time to TSC",
+                .func = test__perf_time_to_tsc,
+        },
+#endif
+        {
+                .desc = "Test object code reading",
+                .func = test__code_reading,
+        },
+        {
+                .desc = "Test sample parsing",
+                .func = test__sample_parsing,
+        },
+        {
+                .desc = "Test using a dummy software event to keep tracking",
+                .func = test__keep_tracking,
+        },
+        {
+                .desc = "Test parsing with no sample_id_all bit set",
+                .func = test__parse_no_sample_id_all,
+        },
         {
                 .func = NULL,
         },