From patchwork Thu Oct 29 11:08:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 55750 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp488115lbr; Thu, 29 Oct 2015 04:08:25 -0700 (PDT) X-Received: by 10.140.134.84 with SMTP id 81mr1294967qhg.102.1446116905734; Thu, 29 Oct 2015 04:08:25 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id u66si705335qku.123.2015.10.29.04.08.25; Thu, 29 Oct 2015 04:08:25 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 1601862043; Thu, 29 Oct 2015 11:08:25 +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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,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 7756E62040; Thu, 29 Oct 2015 11:08:21 +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 458676203E; Thu, 29 Oct 2015 11:08:19 +0000 (UTC) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by lists.linaro.org (Postfix) with ESMTPS id 0D54961B64 for ; Thu, 29 Oct 2015 11:08:11 +0000 (UTC) Received: by lbbec13 with SMTP id ec13so26090410lbb.0 for ; Thu, 29 Oct 2015 04:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Qz/DydS5oIGqm/fqTpHy4SjYPnvg4RvFzTuCJig7wTs=; b=ksQxNnnv9MQQHAyQyrJ3ff3blKkjDPeIexGWoB6HXTruzlJiU/eyNgE3PkH3LG2RNB Mhw0b1op0LtSOFHTkiX9GzSyvgQqUcu3NFWku5U9M8W1SiHzXpf8unZE5ZEQxHxgevNF Pc3MDfkiZ15Opeii8WzTd+zEeiad7iiROLZZucE52AJER8U94aXLlq1RfxoaAp2hXxpl u2ns43MnhB5wnW8898L6u3l312800d26Wc7Ss1xHzNx6yfPXdCRBI4fjlLY6A5YZNtwS ywhRuVAb42PC1Rvr+vHKIY7XDlJrE+LaNA43yJKOGcsgvC+fL5EI0965jcNRJL9KYHf+ ++1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Qz/DydS5oIGqm/fqTpHy4SjYPnvg4RvFzTuCJig7wTs=; b=MVuXsdG8bf4LdCZjHjpZFAfo/+vEn1bWzhbwWh4Q7U7yJ86vDgoXG6TMOuRau1riBn uxlydpD3nE25cger4fPvW9GuG9z587RFIhOVEp+vT6S596RmpLfQrARYQLoOFP5YQ4Z/ ehi1FkpQEaNrZgDUWgENVFaNcZ55nWSUZ9l7cXw10H53M0WsaxgiLtNmIPLx+b4gzK1w L4yFFTvdHR/Qd9RHHOt206yzKXXrxaP8Z0WLEJ6ft+hGJXLSjNQEvFggZviYoYHslltW rfrW5ch/ovq9lNDyZBi/0dYAHmsI+Fw7phL/NI1kh5Y+u1XIGWr9e3shHwEZrn860QY3 5lfw== X-Gm-Message-State: ALoCoQlBAI8D9pz7KBOBO+kZRTovrZ++gPSJumxJ1U8a4DuVoNKk0GoTGr5fQKQZOu11kFmmQ+fr X-Received: by 10.112.54.169 with SMTP id k9mr600069lbp.95.1446116889642; Thu, 29 Oct 2015 04:08:09 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id xh10sm205667lbb.33.2015.10.29.04.08.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Oct 2015 04:08:08 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 29 Oct 2015 14:08:05 +0300 Message-Id: <1446116885-28746-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH] mergefix: example: classifier: fix duplicate merge lines 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Looks like merge to api-next, cherry-pick from api-next and merge master to api-next produced duplicate patch lines. Found that with inspecting branches with 'git diff master api-next' Signed-off-by: Maxim Uvarov Reviewed-by: Balasubramanian Manoharan --- example/classifier/odp_classifier.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index ae352b1..365c748 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -365,11 +365,6 @@ static void configure_default_queue(odp_pktio_t pktio, appl_args_t *args) exit(EXIT_FAILURE); } - if (0 > odp_cos_queue_set(cos_default, queue_default)) { - EXAMPLE_ERR("odp_cos_queue_set failed"); - exit(EXIT_FAILURE); - } - if (0 > odp_pktio_default_cos_set(pktio, cos_default)) { EXAMPLE_ERR("odp_pktio_default_cos_set failed"); exit(EXIT_FAILURE);