[API-NEXT,09/15] merge fix: odp_queue.c

Message ID 20170127142921.29029-10-maxim.uvarov@linaro.org
State New
Headers show
Series
  • Merge tag 'v1.13.0.0' into api-next
Related show

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 platform/linux-generic/odp_queue.c | 3 ---
 1 file changed, 3 deletions(-)

-- 
2.11.0.295.gd7dffce

Patch

diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index 37fa99d5..66086959 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -570,11 +570,8 @@  static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[],
 	if (queue->s.type == ODP_QUEUE_TYPE_SCHED)
 		sched_fn->save_context(queue);
 
-<<<<<<< HEAD
 	UNLOCK(&queue->s.lock);
 
-=======
->>>>>>> v1.13.0.0
 	return i;
 }