From patchwork Thu Nov 26 11:01:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 57323 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp440430lbb; Thu, 26 Nov 2015 03:01:26 -0800 (PST) X-Received: by 10.140.218.80 with SMTP id o77mr45797393qhb.22.1448535686031; Thu, 26 Nov 2015 03:01:26 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id a79si18668242qgf.89.2015.11.26.03.01.24; Thu, 26 Nov 2015 03:01:25 -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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 7A50A61A43; Thu, 26 Nov 2015 11:01:24 +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_H3, RCVD_IN_MSPIKE_WL, 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 CC9C1619C5; Thu, 26 Nov 2015 11:01:16 +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 ABE7D619CF; Thu, 26 Nov 2015 11:01:10 +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 9D9EA619C3 for ; Thu, 26 Nov 2015 11:01:09 +0000 (UTC) Received: by lffu14 with SMTP id u14so93617959lff.1 for ; Thu, 26 Nov 2015 03:01:08 -0800 (PST) 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=dQSQ0zkDLhfit0QCQAvJwTpllStqhFAYWyUyPXXJhtY=; b=XDCmzZSDkkOdw2sD/T5nXx9LRS0jC0Lkn3m88fn8DMhs3cz+//Znzd2MrQkjLIY7q7 aBZ9igFz+sLCZPerva5l2R9Rk4z4tdA+rd2YpaNB5vbLi7AA5xKYpgDhjTfaTM33SYYf 7HMbFamZmusFJv8ZoiP5BF/U+7yS7uj26TxXX6Gbmx7rWo54BD+Hpu/BdlJsSC1mg0i5 tCK7UpeJdRreNBfSdHGcw7rlSD0LQkFDwwjPii2fwytjzIlc2X+j/Ix4AybU1EXZcrqR FpIzYpSi2HfsVie194Hf8/l5VTfOUPt9tR+/gDnGlkj1tHxd5TBLs6ZOMNxvXaLlsQek rCPA== 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=dQSQ0zkDLhfit0QCQAvJwTpllStqhFAYWyUyPXXJhtY=; b=WKYFbkkgZFpeWEbd95sCLMEfV1tqmpKr76efw3IOevWJOcKq6vqFpYxNPcAIeJMiNf YrpTku3zX+4plccWMEaBxtkjxJcYarHHNAcOCGxsyTj7AzM9nXSyA8ZaFeOt2JpcF1lQ Ey5vAeaY+xlyQ9oer71fFFD4+d1962SrBz8XAbyVoZV0Dot6QsMHdcwT1GedfI5QoDBH 7OxLLUkN2f6eUqj8znFMesTi8+E/WqatDbdSUVYcyqS1vKktZl47diPhc/6yNSK44XLM xy/ZXh/HrOVAnsAvnfhwIHfOMFrK2uSOxMHIVGXsNtyalcXCht4tU4e7CEwG4iAwyqGB kmZg== X-Gm-Message-State: ALoCoQlR3MGFggAfQyOrfaBXV22U8gVqDtUejyzgPcQx6fqkY7E3DXYukQ2X35U346p2pqZ2ZvwO X-Received: by 10.112.202.101 with SMTP id kh5mr17378817lbc.66.1448535668465; Thu, 26 Nov 2015 03:01:08 -0800 (PST) Received: from localhost.localdomain (ppp91-76-161-180.pppoe.mtu-net.ru. [91.76.161.180]) by smtp.gmail.com with ESMTPSA id of8sm1847407lbb.7.2015.11.26.03.01.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Nov 2015 03:01:07 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 26 Nov 2015 14:01:07 +0300 Message-Id: <1448535667-32317-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH] mergefix: add mising includes to Makefile.inc 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 conflict was not cleanly fixed moving includes from Makefile.am to Makefile.inc. Adding missed. Signed-off-by: Maxim Uvarov --- platform/Makefile.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/Makefile.inc b/platform/Makefile.inc index e6984cc..ed93483 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -32,15 +32,18 @@ odpapiinclude_HEADERS = \ $(top_srcdir)/include/odp/api/debug.h \ $(top_srcdir)/include/odp/api/errno.h \ $(top_srcdir)/include/odp/api/event.h \ + $(top_srcdir)/include/odp/api/hash.h \ $(top_srcdir)/include/odp/api/hints.h \ $(top_srcdir)/include/odp/api/init.h \ $(top_srcdir)/include/odp/api/packet.h \ $(top_srcdir)/include/odp/api/packet_flags.h \ $(top_srcdir)/include/odp/api/packet_io.h \ + $(top_srcdir)/include/odp/api/packet_io_stats.h \ $(top_srcdir)/include/odp/api/pool.h \ $(top_srcdir)/include/odp/api/queue.h \ $(top_srcdir)/include/odp/api/random.h \ $(top_srcdir)/include/odp/api/rwlock.h \ + $(top_srcdir)/include/odp/api/rwlock_recursive.h \ $(top_srcdir)/include/odp/api/schedule.h \ $(top_srcdir)/include/odp/api/schedule_types.h \ $(top_srcdir)/include/odp/api/shared_memory.h \ @@ -48,6 +51,7 @@ odpapiinclude_HEADERS = \ $(top_srcdir)/include/odp/api/std_types.h \ $(top_srcdir)/include/odp/api/sync.h \ $(top_srcdir)/include/odp/api/system_info.h \ + $(top_srcdir)/include/odp/api/spinlock_recursive.h \ $(top_srcdir)/include/odp/api/thread.h \ $(top_srcdir)/include/odp/api/thrmask.h \ $(top_srcdir)/include/odp/api/ticketlock.h \