Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

diff --cc tools/perf/util/trace-event-read.c
index 43f19c1fed3a0cea6e93853eaf9d8b500ddb3127,46066391288acd37159e7a6a3e72b0f516439dc1..cb54cd002f49b3e8abb45e55b8906af3bb66467c
--- 1/tools/perf/util/trace-event-read.c
--- 2/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@@ -51,8 -51,13 +51,14 @@@ static int long_size
  static unsigned long  page_size;
  
  static ssize_t calc_data_size;
 +static bool repipe;
  
+ /* If it fails, the next read will report it */
+ static void skip(int size)
+ {
+       lseek(input_fd, size, SEEK_CUR);
+ }
+ 
  static int do_read(int fd, void *buf, int size)
  {
        int rsize = size;

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