https://bugs.linaro.org/show_bug.cgi?id=1617
--- Comment #1 from Petri Savolainen <[email protected]> ---
Also Git log documents a merge conflict
commit 0da7ce4d558dfe63e9f42ace43e61b7fcdd56b09
Merge: 03181a7 1da1a0d
Author: Maxim Uvarov <[email protected]>
Date: Thu Jun 4 20:14:58 2015 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <[email protected]>
Conflicts:
test/validation/odp_pktio.c
--
You are receiving this mail because:
You are the assignee for the bug._______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp
