Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
	drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 0 insertions, 3 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 5376378e0cfc..b059dc50cc2d 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -371,7 +371,6 @@ static int perl_start_script(const char *script, int argc, const char **argv)
         run_start_sub();
 
         free(command_line);
-        fprintf(stderr, "perf trace started with Perl script %s\n\n", script);
         return 0;
 error:
         perl_free(my_perl);
@@ -394,8 +393,6 @@ static int perl_stop_script(void)
         perl_destruct(my_perl);
         perl_free(my_perl);
 
-        fprintf(stderr, "\nperf trace Perl script stopped\n");
-
         return 0;
 }