From patchwork Fri Jan 27 14:29:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92659 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230831obz; Fri, 27 Jan 2017 06:35:12 -0800 (PST) X-Received: by 10.200.52.129 with SMTP id w1mr7648031qtb.43.1485527712263; Fri, 27 Jan 2017 06:35:12 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d192si3634699qka.304.2017.01.27.06.35.11; Fri, 27 Jan 2017 06:35:12 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id ABF9460806; Fri, 27 Jan 2017 14:35:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7F8C260E18; Fri, 27 Jan 2017 14:30:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 525D760E18; Fri, 27 Jan 2017 14:30:46 +0000 (UTC) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id 0A4BC609F2 for ; Fri, 27 Jan 2017 14:29:56 +0000 (UTC) Received: by mail-lf0-f44.google.com with SMTP id z134so162792367lff.3 for ; Fri, 27 Jan 2017 06:29:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8OTDQBpjnUhNWDGZFx29MwiCnR+B7e8uOUhHs/sH2uU=; b=ldpurhecoXP68AvzUEkOu0Zuj1Wnc6dRGqwKm98AnbIZcOw82z0N9Xi3xzM2mpvp+I hW2qxViR0bue9Kb0IuwoXaSSIM7MK5+jkNQ84ULoFlaxKySqiEC9rRIiG/+1uejNchoI 9lof1aS/qElpJwqj/6fBWXcChB9CPJoWVn+IM/QxgpOtE5WPCEsdOT9a3/VQsCzcqxyE Dyt8GsoTJOX8/307sOvy5rQ7Kn7Pvig6djVnWRw7RTvKFujcOXveNkbll7pmzfti39jt 5fVlKNdZ/puGM+zhaKKyTKFzm/7mo72nnhs9AinaIkWmCV7I0U6oO2V4wUcKK9bz5l+Z XuCw== X-Gm-Message-State: AIkVDXLFyoIDtqVX8bdLBjhrC32w4U+n/dxh7kw/zAyMXaZl65Gx/tgKdvBOzJBMAQUnw8CdpkM= X-Received: by 10.25.22.96 with SMTP id m93mr2992834lfi.101.1485527394491; Fri, 27 Jan 2017 06:29:54 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:53 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:15 +0300 Message-Id: <20170127142921.29029-10-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 09/15] merge fix: odp_queue.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/odp_queue.c | 3 --- 1 file changed, 3 deletions(-) -- 2.11.0.295.gd7dffce 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; }