Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 0 insertions, 12 deletions

diff --git a/testsuite/systemtap.samples/ioblocktest.stp b/testsuite/systemtap.samples/ioblocktest.stp
deleted file mode 100644
index f8a1c568..00000000
--- a/testsuite/systemtap.samples/ioblocktest.stp
+++ /dev/null
@@ -1,12 +0,0 @@
-#! stap
-global teststr
-probe begin { println("systemtap starting probe") }
-
-probe ioblock.request, ioblock.end {
-   teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector,
-                      bio_rw_str(rw), bio_rw_num(rw))
-}
-probe end { 
-   println("systemtap ending probe")
-   printf("%s", teststr)
-}