Merge commit 'origin/master' into pr7043

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

1 files changed, 6 insertions, 6 deletions

diff --git a/testsuite/buildok/process-all-probes.stp b/testsuite/buildok/process-all-probes.stp
index 91a96514..c754462b 100755
--- a/testsuite/buildok/process-all-probes.stp
+++ b/testsuite/buildok/process-all-probes.stp
@@ -2,11 +2,11 @@
 
 // Tests if all probes in the process tapset are resolvable.
 
-probe   process.create,
-        process.start,
-        process.exec,
-        process.exec_complete,
-        process.exit,
-        process.release
+probe   kprocess.create,
+        kprocess.start,
+        kprocess.exec,
+        kprocess.exec_complete,
+        kprocess.exit,
+        kprocess.release
 {
 }