From patchwork Wed Oct 4 17:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114782 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3354776qgn; Wed, 4 Oct 2017 10:01:30 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCUSjDJUcqsNYhB54Y+5wMu1TmrjBg8Yj5/BjUnZZIj8nqi4JF1/FSTfjsyviivcLgzK02B X-Received: by 10.36.188.1 with SMTP id n1mr29507817ite.96.1507136489955; Wed, 04 Oct 2017 10:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507136489; cv=none; d=google.com; s=arc-20160816; b=aFUQGOI4BEyI4UEh0W3oyraByyni7WEtqejwoLW1MtO+vZn45L6yT7wgElR9Hw9KlI nYpVEbLOXeZ0U11rNhJ9dCtY3+rpuq1+2clRaE3pBf4nm/JVY5DEdA5uhwosq6Nhl8f4 FF/16VVt2lL10ulZPige5P0rs528ziRzd7sNu1orHP65Ccs0sZaxQEGh7o8dtBM67jrp C+UFKz0+FIMSjwGLKz9++YBZbC4sgwC0EUiGMDumZBD+89nwiLw3My0PF1mcEbm8taDT 5/RZNZp6fz0pOHyN4K0f7x0mfoSih4/cvJzg2X5h8XfhQegta9ShknzJtzCI1e/Pcp1b dsAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=nkUZKrMJQtAzRCB15a7bcHb/7/NGIIr/Q/vv22Dlx3I=; b=hmFP28iH+hIA7plyFxy/J79Xj9edZdMmL02HmgIwAt4qd/Z5OtFw4uUP5VSJ+8qIy1 vN3xDorckUrp9yQ2uuPgH4rgslXHNKiaJbRlOz1R7N/EoOelOEwLai0xRJCWIqkhZkjw q/0ODzg/6kk8QHKeFBTKDVWpHmYUaRc39iWn5o9mcHv2ZNTIpnp9GxIOMI/j1/AMluPB GJTq7NFWSSic2D7y6aiZriSPW2MK4Nqrnpfal56Ufa0q0cZx9VISt72GHQUw5EmIhWgB Iq9CH5O9olBLzFmO4BH/f99QJL9LPw4Nk522+o8hjnDwZ+9XoazCeR5Zct0JDcwnRq5v 9nwg== ARC-Authentication-Results: i=1; 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c12si12346085itj.2.2017.10.04.10.01.29; Wed, 04 Oct 2017 10:01:29 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 4135660D8F; Wed, 4 Oct 2017 17:01:29 +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.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 C8BAA60C9F; Wed, 4 Oct 2017 17:00:56 +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 7E90D60C4F; Wed, 4 Oct 2017 17:00:50 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 514A560C2B for ; Wed, 4 Oct 2017 17:00:49 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward100o.mail.yandex.net (Yandex) with ESMTP id DC9BE2A215AE for ; Wed, 4 Oct 2017 20:00:46 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id fVdQ8GFmpu-0krCQRtH; Wed, 04 Oct 2017 20:00:46 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5lX1oGfT36-0kXqAohL; Wed, 04 Oct 2017 20:00:46 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 4 Oct 2017 20:00:05 +0300 Message-Id: <1507136405-10048-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507136405-10048-1-git-send-email-odpbot@yandex.ru> References: <1507136405-10048-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 210 Subject: [lng-odp] [PATCH API-NEXT v1 1/1] linux-gen: fix api-next merge conflict 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" From: Maxim Uvarov automerging of commit "052d268793" linux-gen: deduplicate arch-specific files was wrong, fix it here. Signed-off-by: Maxim Uvarov --- /** Email created from pull request 210 (muvarov:api-next) ** https://github.com/Linaro/odp/pull/210 ** Patch: https://github.com/Linaro/odp/pull/210.patch ** Base sha: 75cfc6f70d5b21d6f04082e1d03a7e677a895280 ** Merge commit sha: 29cd6407208292b2fedf8e008c21713678f06e1e **/ platform/linux-generic/Makefile.am | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8f6c65703..f6e8313bc 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -195,22 +195,6 @@ noinst_HEADERS = \ ${srcdir}/include/protocols/thash.h \ ${srcdir}/include/protocols/udp.h -if ARCH_IS_ARM -noinst_HEADERS += ${srcdir}/arch/arm/odp_atomic.h \ - ${srcdir}/arch/arm/odp_cpu.h \ - ${srcdir}/arch/arm/odp_cpu_idling.h \ - ${srcdir}/arch/arm/odp_llsc.h -endif -if ARCH_IS_MIPS64 -noinst_HEADERS += ${srcdir}/arch/mips64/odp_cpu.h -endif -if ARCH_IS_POWERPC -noinst_HEADERS += ${srcdir}/arch/powerpc/odp_cpu.h -endif -if ARCH_IS_X86 -noinst_HEADERS += ${srcdir}/arch/x86/odp_cpu.h -endif - __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ _ishm.c \