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 CA366A04C3 for ; Fri, 22 Nov 2019 15:41:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C36EB91; Fri, 22 Nov 2019 15:41:57 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 75F0691 for ; Fri, 22 Nov 2019 15:41:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433716; 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=24DGUivFJYV5tn1VsHYgGj9CHUtFbjSi/RXPPWzB7bc=; b=b09gF4IDTNOF+nwSZ2fDOLyhmL+Q5uRwCoLNh41UOswNd6fG2FycOHIjRf321PXbjRhAi3 CdpxXbcgWSVQeJa5Kg2FBh/iH0FfEfNlvEel1ej35gOkUZptArZb4ZDjo8yK7idnQxNO5x 1lgOoe2Y5RQzqFhAtk0+EIm5FiB80m8= 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-128-77HOPhS2PQCf-sWzp19OHw-1; Fri, 22 Nov 2019 09:41:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1AEDB1800D41; Fri, 22 Nov 2019 14:41:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47A6D8516; Fri, 22 Nov 2019 14:41:52 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: dpdk stable Date: Fri, 22 Nov 2019 14:40:51 +0000 Message-Id: <20191122144131.21231-5-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 77HOPhS2PQCf-sWzp19OHw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'ethdev: fix doc reference to FDIR disabled mode' 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 11/29/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/79888759a451364bbf= 5893a2a3c65ba988afef14 Thanks. Kevin. --- >From 79888759a451364bbf5893a2a3c65ba988afef14 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Sun, 18 Aug 2019 10:37:46 +0100 Subject: [PATCH] ethdev: fix doc reference to FDIR disabled mode [ upstream commit 3c5f2cdb56d769755962a6c184e2a0a0ad70d93f ] There is no RTE_FDIR_DISABLE. The right name is RTE_FDIR_MODE_NONE. Fixes: af75078fece3 ("first public release") Signed-off-by: Andrew Rybchenko --- lib/librte_ethdev/rte_ethdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.= h index ec4b7752c..9fbf65069 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -856,5 +856,5 @@ enum rte_fdir_status_mode { * of an Ethernet port. * - * If mode is RTE_FDIR_DISABLE, the pballoc value is ignored. + * If mode is RTE_FDIR_MODE_NONE, the pballoc value is ignored. */ struct rte_fdir_conf { --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:55.484787099 +0000 +++ 0005-ethdev-fix-doc-reference-to-FDIR-disabled-mode.patch=092019-11-22 = 14:36:55.122150889 +0000 @@ -1 +1 @@ -From 3c5f2cdb56d769755962a6c184e2a0a0ad70d93f Mon Sep 17 00:00:00 2001 +From 79888759a451364bbf5893a2a3c65ba988afef14 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3c5f2cdb56d769755962a6c184e2a0a0ad70d93f ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index dc6596bc9..8fa89bf76 100644 +index ec4b7752c..9fbf65069 100644 @@ -20 +21 @@ -@@ -912,5 +912,5 @@ enum rte_fdir_status_mode { +@@ -856,5 +856,5 @@ enum rte_fdir_status_mode {