diff --git a/[refs] b/[refs]
index 887a8b59efe9..25c397172b2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 157f9c00e88529ed84bd7d581a40d411e5414cf0
+refs/heads/master: 32c0bd9624115041cfec31c0436995418083090a
diff --git a/trunk/block/Kconfig b/trunk/block/Kconfig
index 0cbb3b88b59a..7cdaa1d72252 100644
--- a/trunk/block/Kconfig
+++ b/trunk/block/Kconfig
@@ -50,6 +50,8 @@ config BLK_DEV_IO_TRACE
 	select RELAY
 	select DEBUG_FS
 	select TRACEPOINTS
+	select TRACING
+	select STACKTRACE
 	help
 	  Say Y here if you want to be able to trace the block layer actions
 	  on a given queue. Tracing allows you to see any traffic happening
@@ -58,6 +60,12 @@ config BLK_DEV_IO_TRACE
 
 	  git://git.kernel.dk/blktrace.git
 
+	  Tracing also is possible using the ftrace interface, e.g.:
+
+	    echo 1 > /sys/block/sda/sda1/trace/enable
+	    echo blk > /sys/kernel/debug/tracing/current_tracer
+	    cat /sys/kernel/debug/tracing/trace_pipe
+
 	  If unsure, say N.
 
 config BLK_DEV_BSG