From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A0921A04F0 for ; Tue, 10 Dec 2019 16:00:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 998CC1BE80; Tue, 10 Dec 2019 16:00:41 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id BB0B91B13C for ; Tue, 10 Dec 2019 16:00:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gxhe6QJuEjFbd9KaDK9P+sI6Oavrzl/KXtHZvl/KDas=; b=e/wolFl/KxoflDkSOhSWA4DcxG+7dg6GocEYQ0rIaMKCJ+5DxfuKaTYB0U8NHKDWJfnaJR TRSt3GpKf1YO6pJ69/+PXbfclJ1Nmss/RX5Ko1UNN7QWkkA4yW5/hzdSPLkBryXDK27n19 FJjC8AiDEq+L6A15MdjY8kJS7b2kWwQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-N3w_qt1DNBqr22qvJaiPnw-1; Tue, 10 Dec 2019 10:00:35 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37BA2107ACCC; Tue, 10 Dec 2019 15:00:34 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 009D55D9C5; Tue, 10 Dec 2019 15:00:32 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Thomas Monjalon , dpdk stable Date: Tue, 10 Dec 2019 14:58:56 +0000 Message-Id: <20191210145937.32755-22-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: N3w_qt1DNBqr22qvJaiPnw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'ethdev: fix include of ethernet header file' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2b48c8332e97a0ddc9= df044227653ecb3d467c3b Thanks. Kevin. --- >From 2b48c8332e97a0ddc9df044227653ecb3d467c3b Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 23 Oct 2019 13:53:00 +0100 Subject: [PATCH] ethdev: fix include of ethernet header file [ upstream commit 22a076367369a04391a7b16d60a2905cf5c1da46 ] The include for rte_ether.h in each of these files should not use quotes, as the header file is not in the librte_ethdev directory. These are now updated to use <> symbols, to search directories pre-designated by the compiler. Fixes: 57668ed7bc08 ("net: move ethernet definitions to the net library") Signed-off-by: Ciara Power Acked-by: Thomas Monjalon --- lib/librte_ethdev/rte_eth_ctrl.h | 2 +- lib/librte_ethdev/rte_ethdev.c | 2 +- lib/librte_ethdev/rte_ethdev.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_c= trl.h index 925a63f24..0263e5040 100644 --- a/lib/librte_ethdev/rte_eth_ctrl.h +++ b/lib/librte_ethdev/rte_eth_ctrl.h @@ -8,5 +8,5 @@ #include #include -#include "rte_ether.h" +#include =20 /** diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.= c index 3c75d3c78..b3fce9b08 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -38,6 +38,6 @@ #include #include +#include =20 -#include "rte_ether.h" #include "rte_ethdev.h" #include "rte_ethdev_driver.h" diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.= h index 5d447bc12..a9472af62 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -155,6 +155,6 @@ extern "C" { #include #include +#include =20 -#include "rte_ether.h" #include "rte_eth_ctrl.h" #include "rte_dev_info.h" --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.559020730 +0000 +++ 0022-ethdev-fix-include-of-ethernet-header-file.patch=092019-12-10 14:4= 9:39.024458290 +0000 @@ -1 +1 @@ -From 22a076367369a04391a7b16d60a2905cf5c1da46 Mon Sep 17 00:00:00 2001 +From 2b48c8332e97a0ddc9df044227653ecb3d467c3b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22a076367369a04391a7b16d60a2905cf5c1da46 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index be4b4af65..1416c371f 100644 +index 925a63f24..0263e5040 100644 @@ -32 +32,0 @@ - #include "rte_flow.h" @@ -33,0 +34 @@ + /** @@ -35 +36 @@ -index 78da29397..7743205d3 100644 +index 3c75d3c78..b3fce9b08 100644 @@ -47 +48 @@ -index 33c528bb8..c36c1b631 100644 +index 5d447bc12..a9472af62 100644 @@ -50 +51 @@ -@@ -157,6 +157,6 @@ extern "C" { +@@ -155,6 +155,6 @@ extern "C" { @@ -55,0 +57 @@ + #include "rte_eth_ctrl.h" @@ -57 +58,0 @@ -=20