diff --git a/[refs] b/[refs]
index 942af1caed58..d0a4815e3ac6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d31597d37ec8842b9575005190fde2898764628
+refs/heads/master: 848afbd72ed02db1ed20ae7917c241983df7b314
diff --git a/trunk/drivers/staging/lttng/lib/Makefile b/trunk/drivers/staging/lttng/lib/Makefile
new file mode 100644
index 000000000000..e5735ecaa6fc
--- /dev/null
+++ b/trunk/drivers/staging/lttng/lib/Makefile
@@ -0,0 +1,11 @@
+obj-m += lib-ring-buffer.o
+
+lib-ring-buffer-objs := \
+	ringbuffer/ring_buffer_backend.o \
+	ringbuffer/ring_buffer_frontend.o \
+	ringbuffer/ring_buffer_iterator.o \
+	ringbuffer/ring_buffer_vfs.o \
+	ringbuffer/ring_buffer_splice.o \
+	ringbuffer/ring_buffer_mmap.o \
+	prio_heap/lttng_prio_heap.o \
+	../wrapper/splice.o