projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: kernel-consumerd: merge conflict left in file
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index 8c0a87737056e4e2e39fa6adadbeb7bccb4305bc..5334d13585842b0d63ab7f61d2b8cfa33e2b3b5e 100644
(file)
--- 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.
*/
* 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;
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;
}
goto end;
}
This page took
0.026222 seconds
and
4
git commands to generate.