diff -Nru ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/debian/changelog ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/debian/changelog
--- ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/debian/changelog	2019-03-20 16:31:51.000000000 +0000
+++ ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/debian/changelog	2019-04-10 17:02:22.000000000 +0000
@@ -1,8 +1,8 @@
-ust (2.10.x+stable+git2259+201903201631~ubuntu14.04.1) trusty; urgency=low
+ust (2.10.x+stable+git2261+201904101702~ubuntu14.04.1) trusty; urgency=low
 
   * Auto build.
 
- -- Ubuntu LTTng <lttng@lists.launchpad.net>  Wed, 20 Mar 2019 16:31:51 +0000
+ -- Ubuntu LTTng <lttng@lists.launchpad.net>  Wed, 10 Apr 2019 17:02:22 +0000
 
 lttng-ust (2.10.x+stable-0~lttng1) unstable; urgency=medium
 
diff -Nru ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/debian/git-build-recipe.manifest ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/debian/git-build-recipe.manifest
--- ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/debian/git-build-recipe.manifest	2019-03-20 16:31:51.000000000 +0000
+++ ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/debian/git-build-recipe.manifest	2019-04-10 17:02:22.000000000 +0000
@@ -1,3 +1,3 @@
-# git-build-recipe format 0.4 deb-version {debupstream}+git2259+201903201631
-lp:lttng-ust git-commit:13d2c5baf1565ba1daa2b96f5e4a297571c505b4
+# git-build-recipe format 0.4 deb-version {debupstream}+git2261+201904101702
+lp:lttng-ust git-commit:cac721e112c0f1c2f8cc5bc1fc6c7bbfe9115b62
 nest packaging lp:~lttng/lttng-ust/+git/packaging debian git-commit:e5c008c2469f38410bda65d64feb6e7e6fdf242b
diff -Nru ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/include/lttng/ust-ctl.h ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/include/lttng/ust-ctl.h
--- ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/include/lttng/ust-ctl.h	2019-03-20 16:31:50.000000000 +0000
+++ ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/include/lttng/ust-ctl.h	2019-04-10 17:02:21.000000000 +0000
@@ -240,6 +240,12 @@
 		int producer_active);
 
 /* index */
+
+/*
+ * Getters which need to be used on the current packet (between get/put
+ * or get_next/put_next.
+ */
+
 int ustctl_get_timestamp_begin(struct ustctl_consumer_stream *stream,
 		uint64_t *timestamp_begin);
 int ustctl_get_timestamp_end(struct ustctl_consumer_stream *stream,
@@ -250,15 +256,26 @@
 	uint64_t *content_size);
 int ustctl_get_packet_size(struct ustctl_consumer_stream *stream,
 	uint64_t *packet_size);
-int ustctl_get_stream_id(struct ustctl_consumer_stream *stream,
-		uint64_t *stream_id);
-int ustctl_get_current_timestamp(struct ustctl_consumer_stream *stream,
-		uint64_t *ts);
 int ustctl_get_sequence_number(struct ustctl_consumer_stream *stream,
 		uint64_t *seq);
+
+/*
+ * Getter returning state invariant for the stream, which can be used
+ * without "get" operation.
+ */
+
+int ustctl_get_stream_id(struct ustctl_consumer_stream *stream,
+		uint64_t *stream_id);
 int ustctl_get_instance_id(struct ustctl_consumer_stream *stream,
 		uint64_t *id);
 
+/*
+ * Getter returning the current timestamp as perceived from the
+ * tracer.
+ */
+int ustctl_get_current_timestamp(struct ustctl_consumer_stream *stream,
+		uint64_t *ts);
+
 /* returns whether UST has perf counters support. */
 int ustctl_has_perf_counters(void);
 
diff -Nru ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/liblttng-ust/lttng-ring-buffer-client.h ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/liblttng-ust/lttng-ring-buffer-client.h
--- ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/liblttng-ust/lttng-ring-buffer-client.h	2019-03-20 16:31:50.000000000 +0000
+++ ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/liblttng-ust/lttng-ring-buffer-client.h	2019-04-10 17:02:21.000000000 +0000
@@ -556,12 +556,11 @@
 		struct lttng_ust_shm_handle *handle,
 		uint64_t *stream_id)
 {
-	struct packet_header *header;
+	struct channel *chan = shmp(handle, buf->backend.chan);
+	struct lttng_channel *lttng_chan = channel_get_private(chan);
+
+	*stream_id = lttng_chan->id;
 
-	header = client_packet_header(buf, handle);
-	if (!header)
-		return -1;
-	*stream_id = header->stream_id;
 	return 0;
 }
 
@@ -592,10 +591,8 @@
 		struct lttng_ust_shm_handle *handle,
 		uint64_t *id)
 {
-	struct packet_header *header;
+	*id = buf->backend.cpu;
 
-	header = client_packet_header(buf, handle);
-	*id = header->stream_instance_id;
 	return 0;
 }
 
diff -Nru ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/.pc/.quilt_patches ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/.pc/.quilt_patches
--- ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/.pc/.quilt_patches	2019-03-20 16:31:51.000000000 +0000
+++ ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/.pc/.quilt_patches	2019-04-10 17:02:22.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-2297913/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches
+/home/buildd/build-RECIPEBRANCHBUILD-2309974/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches
diff -Nru ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/.pc/.quilt_series ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/.pc/.quilt_series
--- ust-2.10.x+stable+git2259+201903201631~ubuntu14.04.1/.pc/.quilt_series	2019-03-20 16:31:51.000000000 +0000
+++ ust-2.10.x+stable+git2261+201904101702~ubuntu14.04.1/.pc/.quilt_series	2019-04-10 17:02:22.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-2297913/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series
+/home/buildd/build-RECIPEBRANCHBUILD-2309974/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series