From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 3 May 2021 15:52:51 +0000 (-0400)
Subject: Build fix: kernel-consumerd: merge conflict left in file
X-Git-Tag: v2.13.0-rc2~39
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=fc88a5ec6f6723c3b5e3d52ec08b19c11273cc49;p=lttng-tools.git

Build fix: kernel-consumerd: merge conflict left in file

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I71defaee6724a08661567af879b91a57d9dae74c
---

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 8c0a87737..5334d1358 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1604,17 +1604,10 @@ enum get_next_subbuffer_status get_subbuffer_common(
 		 * when there is no data for a finalized stream. Those can be
 		 * combined into a -ENODATA return value.
 		 */
-<<<<<<< HEAD
-		if (ret == -EAGAIN) {
-			ret = -ENODATA;
-		}
-
-=======
 		status = GET_NEXT_SUBBUFFER_STATUS_NO_DATA;
 		goto end;
 	default:
 		status = GET_NEXT_SUBBUFFER_STATUS_ERROR;
->>>>>>> ba6c36321 (Clean-up: consumerd: use a specific status code for get_next_subbuffer)
 		goto end;
 	}