From patchwork Fri Jan 27 14:29:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92651 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp228514obz; Fri, 27 Jan 2017 06:30:00 -0800 (PST) X-Received: by 10.55.143.3 with SMTP id r3mr8758752qkd.152.1485527400388; Fri, 27 Jan 2017 06:30:00 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k5si3646893qta.43.2017.01.27.06.29.59; Fri, 27 Jan 2017 06:30:00 -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 691BB60DC1; Fri, 27 Jan 2017 14:29:59 +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 4FE67609C2; Fri, 27 Jan 2017 14:29:53 +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 10FAB609D7; Fri, 27 Jan 2017 14:29:48 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 8F7C1609AC for ; Fri, 27 Jan 2017 14:29:46 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id z134so162790081lff.3 for ; Fri, 27 Jan 2017 06:29:46 -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; bh=iy/tl08kmH4LXiTFXhC1jJ2glmai96ZZVbpFmOLw0Vo=; b=DS06aoOBibe4hXME6YLV6O867g9iTN5uCzgFgQBRvAlRKBR/6lMTgoUDSnqoUcoeey NSOJqGI9ZeeCBK3wdvxZjDCBPWJtORABA4S1feEZ3cnfp1YgMYS2oDr9dnuq0jDs82Tf H6l+D3bDGYzJZ7u2jeYKR+7XGlliWSB7s7zClO6QQG5k152I9gFXBph5U8ttkC4gtT6X xuDPncO7NqhdNgKREGWYofItWZtzbS8lYjUF+cwRrpSX9Xr7nMDHrsbjlEBDEjRSkr20 ZFJ5KVKeBU3oP8Qh5DvnGYJ/L/TA8IJVH1FCw9PgtMu3Yz1zFAKtcDcB4y0yDMBlgrLA jshQ== X-Gm-Message-State: AIkVDXIV8NalO50xVGF+kdy2tmuMZhOdbwu6tfsMrYl3daCHTDUoNZrAGthbS2cW0s4SzGF/jEo= X-Received: by 10.25.65.15 with SMTP id o15mr2416911lfa.14.1485527385032; Fri, 27 Jan 2017 06:29:45 -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.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:44 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:06 +0300 Message-Id: <20170127142921.29029-1-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce Subject: [lng-odp] [API-NEXT PATCH 00/15] Merge tag 'v1.13.0.0' into api-next 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" Please review merge conflicts resolution for merge v1.13.0.0 into api-next branch. Full merge is here: https://github.com/muvarov/odp/commits/api-next Conflicts can be found in approriate commit itself: https://github.com/muvarov/odp/commit/ce824cbd747aa7d86200a4ddc1004f15d535932b Git access is: https://github.com/muvarov/odp.git or git@github.com:muvarov/odp.git Travis CI passed for that tests: https://travis-ci.org/muvarov/odp/builds/195867356 Idea is to squash all 'merge fix' commits into main merge commit before pushing to official repo. Thank you, Maxim. Maxim Uvarov (15): merge fix: platform/linux-generic/Makefile.am merge fix: doc/driver-api-guide/Doxyfile merge fix: _ishm merge fix: odp_config_internal.h merge fix: odp_schedule_if.h merge fix: odp_packet_internal.h merge fix: odp_init.c merge fix: odp_packet.c merge fix: odp_queue.c merge fix: ./platform/linux-generic/odp_schedule.c merge fix: odp_schedule_sp.c merge fix: odp_crypto_test_inp.c merge fix: test/common_plat/validation/api/packet/packet.h merge fix: test/common_plat/validation/api/packet/packet.c linux-gen: support older libconfig version doc/driver-api-guide/Doxyfile | 10 - platform/linux-generic/Makefile.am | 16 +- platform/linux-generic/_ishm.c | 21 - .../linux-generic/include/odp_config_internal.h | 66 +-- platform/linux-generic/include/odp_internal.h | 6 - .../linux-generic/include/odp_packet_internal.h | 25 - platform/linux-generic/include/odp_schedule_if.h | 6 - platform/linux-generic/odp_init.c | 19 +- platform/linux-generic/odp_packet.c | 513 --------------------- platform/linux-generic/odp_queue.c | 3 - platform/linux-generic/odp_schedule.c | 119 ----- platform/linux-generic/odp_schedule_sp.c | 36 -- .../validation/api/crypto/odp_crypto_test_inp.c | 43 -- test/common_plat/validation/api/packet/packet.c | 483 ------------------- test/common_plat/validation/api/packet/packet.h | 3 - 15 files changed, 23 insertions(+), 1346 deletions(-) -- 2.11.0.295.gd7dffce