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 9B1E3A054C for ; Fri, 14 Feb 2020 18:04:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 89ACAF72; Fri, 14 Feb 2020 18:04: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 1C3B2F72 for ; Fri, 14 Feb 2020 18:04:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699858; 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=1OgSddpPSZxpjCdmMx4hrtg2mt3bUrD56BOqTc6GZm8=; b=BKIHjB0w/+0pZevzBhlgLGaVJ1BAXGCj9Ot9/dWYx2mP/e6J47UOw2CtT3aAHVQXTmqE6m DvG1hMMR8/rMHlR6y0MsEtMk19XLrqm8kbOtezUQvTv3bBNpn2hreupYlDW91iCzy1Qjcs mQQwt95z27geprY7z5QKVrpYE2SYAfA= 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-336-rxwouGscN0GNcIMV4m0U0w-1; Fri, 14 Feb 2020 12:04:13 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1AA441005514; Fri, 14 Feb 2020 17:04:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7D1B8AC4B; Fri, 14 Feb 2020 17:04:08 +0000 (UTC) From: Kevin Traynor To: Reshma Pattan Cc: Xiaolong Ye , dpdk stable Date: Fri, 14 Feb 2020 17:02:58 +0000 Message-Id: <20200214170337.25093-4-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: rxwouGscN0GNcIMV4m0U0w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/ixgbe: remove duplicate function declaration' has been queued to LTS release 18.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/20. 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/742d8d9ce2c058d889= 8dac7ddd2a2d5b330efc98 Thanks. Kevin. --- >From 742d8d9ce2c058d8898dac7ddd2a2d5b330efc98 Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Tue, 14 Jan 2020 11:29:43 +0000 Subject: [PATCH] net/ixgbe: remove duplicate function declaration [ upstream commit 1438472e6ec3bb411bc44f17147a2f0d4d0238de ] Remove duplicate declarations of ixgbe_xmit_fixed_burst_vec from ixgbe_rxtx.c Fixes: 646412f9ff62 ("net/ixgbe: remove limit of Tx burst size") Signed-off-by: Reshma Pattan Acked-by: Xiaolong Ye --- drivers/net/ixgbe/ixgbe_rxtx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.= c index 94bec21831..7f98db15a4 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -88,9 +88,4 @@ #endif =20 -#ifdef RTE_IXGBE_INC_VECTOR -uint16_t ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_p= kts, -=09=09=09=09 uint16_t nb_pkts); -#endif - /********************************************************************* * --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:37.277479635 +0000 +++ 0004-net-ixgbe-remove-duplicate-function-declaration.patch=092020-02-14= 17:02:36.919408606 +0000 @@ -1 +1 @@ -From 1438472e6ec3bb411bc44f17147a2f0d4d0238de Mon Sep 17 00:00:00 2001 +From 742d8d9ce2c058d8898dac7ddd2a2d5b330efc98 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1438472e6ec3bb411bc44f17147a2f0d4d0238de ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ac8fae745e..1b9554ce91 100644 +index 94bec21831..7f98db15a4 100644 @@ -25 +26 @@ --#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) +-#ifdef RTE_IXGBE_INC_VECTOR