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 D4718A04C3 for ; Fri, 22 Nov 2019 15:42:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CBFE92BBB; Fri, 22 Nov 2019 15:42:20 +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 713B32BBD for ; Fri, 22 Nov 2019 15:42:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433737; 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=zbsZEC7OZTn85OKaV1fL4X0L+dLpxFSlLdmVG0lmTTM=; b=UHtYY4xvlKiNX3F4l0yyLz7GcFutKUm4IlPywqgh2DEODeyWBUS0+LS8AnzZt4+xa6ArjI 3Ub5doZCzxicYZbxicCef8LdtCfgxHwWiYHjp3WOpsY08VIQjPyeyTxXRQ30Z7f7gNfwwC Kqi5MRvL3JnBfTdm1otrZAmDwOrZ8bE= 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-302-Yk_p7SAYN2WeIVg9SYGJ-Q-1; Fri, 22 Nov 2019 09:42:11 -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 0D49F801E5D; Fri, 22 Nov 2019 14:42:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id B27EA8516; Fri, 22 Nov 2019 14:42:08 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Stephen Hemminger , Ferruh Yigit , dpdk stable Date: Fri, 22 Nov 2019 14:41:01 +0000 Message-Id: <20191122144131.21231-15-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: Yk_p7SAYN2WeIVg9SYGJ-Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'ethdev: fix typos for ENOTSUP' 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/c8462445aaed2cbd92= fa56f90500d0cce8151749 Thanks. Kevin. --- >From c8462445aaed2cbd92fa56f90500d0cce8151749 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 4 Sep 2019 22:05:31 +0800 Subject: [PATCH] ethdev: fix typos for ENOTSUP [ upstream commit e8c7df5d7d3a47446aa3f90d5ee1ca2662fd0531 ] Fixes: af75078fece3 ("first public release") Signed-off-by: Xiaolong Ye Acked-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.= h index 9fbf65069..5d447bc12 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -2317,5 +2317,5 @@ int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mt= u); * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN filtering not configured. + * - (-ENOTSUP) if hardware-assisted VLAN filtering not configured. * - (-ENODEV) if *port_id* invalid. * - (-EIO) if device is removed. @@ -2340,5 +2340,5 @@ int rte_eth_dev_vlan_filter(uint16_t port_id, uint16_= t vlan_id, int on); * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN stripping not configured. + * - (-ENOTSUP) if hardware-assisted VLAN stripping not configured. * - (-ENODEV) if *port_id* invalid. * - (-EINVAL) if *rx_queue_id* invalid. @@ -2360,5 +2360,5 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint16_t port= _id, uint16_t rx_queue_id, * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. + * - (-ENOTSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. * - (-EIO) if device is removed. @@ -2385,5 +2385,5 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN filtering not configured. + * - (-ENOTSUP) if hardware-assisted VLAN filtering not configured. * - (-ENODEV) if *port_id* invalid. * - (-EIO) if device is removed. --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.024101252 +0000 +++ 0015-ethdev-fix-typos-for-ENOTSUP.patch=092019-11-22 14:36:55.170149863= +0000 @@ -1 +1 @@ -From e8c7df5d7d3a47446aa3f90d5ee1ca2662fd0531 Mon Sep 17 00:00:00 2001 +From c8462445aaed2cbd92fa56f90500d0cce8151749 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e8c7df5d7d3a47446aa3f90d5ee1ca2662fd0531 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 8fa89bf76..d9871782e 100644 +index 9fbf65069..5d447bc12 100644 @@ -20 +21 @@ -@@ -2478,5 +2478,5 @@ int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t m= tu); +@@ -2317,5 +2317,5 @@ int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t m= tu); @@ -27 +28 @@ -@@ -2501,5 +2501,5 @@ int rte_eth_dev_vlan_filter(uint16_t port_id, uint16= _t vlan_id, int on); +@@ -2340,5 +2340,5 @@ int rte_eth_dev_vlan_filter(uint16_t port_id, uint16= _t vlan_id, int on); @@ -34 +35 @@ -@@ -2521,5 +2521,5 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint16_t por= t_id, uint16_t rx_queue_id, +@@ -2360,5 +2360,5 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint16_t por= t_id, uint16_t rx_queue_id, @@ -41 +42 @@ -@@ -2547,5 +2547,5 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id= , +@@ -2385,5 +2385,5 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id= ,