From patchwork Fri Jan 27 14:29:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92662 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp231996obz; Fri, 27 Jan 2017 06:38:02 -0800 (PST) X-Received: by 10.200.34.146 with SMTP id f18mr8538730qta.39.1485527882737; Fri, 27 Jan 2017 06:38:02 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x2si3652923qke.126.2017.01.27.06.38.02; Fri, 27 Jan 2017 06:38:02 -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 605A462DFA; Fri, 27 Jan 2017 14:38:02 +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, TVD_SPACE_RATIO, 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 615CF60D73; Fri, 27 Jan 2017 14:31:40 +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 2C47362E0B; Fri, 27 Jan 2017 14:31:35 +0000 (UTC) Received: from mail-lf0-f42.google.com (mail-lf0-f42.google.com [209.85.215.42]) by lists.linaro.org (Postfix) with ESMTPS id AED7A60DF2 for ; Fri, 27 Jan 2017 14:29:59 +0000 (UTC) Received: by mail-lf0-f42.google.com with SMTP id x1so76118266lff.0 for ; Fri, 27 Jan 2017 06:29:59 -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=yo43jaMROKdMcdp1NaIPYJL1NLmTpm1ysllgUC79uC8=; b=R16ScSdl9xPZvudIaxL2ByDFLEu28jXuxQzYUGHs/IGTxnL+wL3FPocjypJrdRXT2h Rn72JIMt/37PbxgYWo/x4RCbCxw9cjFCljx3jPpbCChvQVXA1rchATOvgC0Ns5kX8oae eWHgR1FuHcgH9VopYOBN/5e1viWUqixhKzv8m+bbWhdyKHo6Nfv53WSwfG53l12E0tzF 0S9f3mLCb5lZwAHefMdleFurLE0oF5uvYrQXATPuZwuD8tWx7hnagyapVScxeCrKPBJI NHvMCEaT20V3559eo6uGtMYcZiH1spvLdeyMymMR8prHDn/frD2BjVao8a9HgWYSpDML Co9g== X-Gm-Message-State: AIkVDXI+dCI3/sdZrAOnxTevEswGEhgkMBU9b23/4G/NThoaSMLUUIVB04Qf2BpSokh6laPls/c= X-Received: by 10.25.199.14 with SMTP id x14mr2353155lff.13.1485527398226; Fri, 27 Jan 2017 06:29:58 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:57 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:19 +0300 Message-Id: <20170127142921.29029-14-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 13/15] merge fix: test/common_plat/validation/api/packet/packet.h 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 --- test/common_plat/validation/api/packet/packet.h | 3 --- 1 file changed, 3 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/test/common_plat/validation/api/packet/packet.h b/test/common_plat/validation/api/packet/packet.h index 95923bc2..783b7a11 100644 --- a/test/common_plat/validation/api/packet/packet.h +++ b/test/common_plat/validation/api/packet/packet.h @@ -35,10 +35,7 @@ void packet_test_concat_extend_trunc(void); void packet_test_extend_small(void); void packet_test_extend_large(void); void packet_test_extend_mix(void); -<<<<<<< HEAD void packet_test_extend_ref(void); -======= ->>>>>>> v1.13.0.0 void packet_test_align(void); void packet_test_offset(void); void packet_test_ref(void);