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-Url: http://git.lttng.org/?a=commitdiff_plain;h=ab1564ae117e420bf23526aa2f670fd0eceb645b;hp=ab1564ae117e420bf23526aa2f670fd0eceb645b;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
---