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 36725A04C3 for ; Fri, 22 Nov 2019 15:42:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2DFFD2BB1; Fri, 22 Nov 2019 15:42:05 +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 5AF912BB1 for ; Fri, 22 Nov 2019 15:42:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433723; 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=qzkp/x94xppSUthuvn4q0/Jd2nb24jIqJxA9ZkwaQkU=; b=TS7xkl2ps5ROKH3EmM3lRdWn3VtItQ9RpocDPdqsGTzBlT2XDogiSwhdyzQT/b6DOGvnPS uMdF0+lETlBR2Byn6lVb9zcoMorldrx/m6I4hM+6RlGPolcBqT6RTizTK2V0tvlCvLy2c7 D0fu67Jum9D9onGRfKEXpbtlTCkYg58= 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-348-mW75gDAMP4KemzmXNyRvOg-1; Fri, 22 Nov 2019 09:42:00 -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 E361CDB89; Fri, 22 Nov 2019 14:41:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF39D6E713; Fri, 22 Nov 2019 14:41:57 +0000 (UTC) From: Kevin Traynor To: Ivan Ilchenko Cc: Andrew Rybchenko , Igor Russkikh , dpdk stable Date: Fri, 22 Nov 2019 14:40:54 +0000 Message-Id: <20191122144131.21231-8-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: mW75gDAMP4KemzmXNyRvOg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/atlantic: remove double function declaration' 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/dba3230859f697c0e2= 078a2f1ba65b492cd690da Thanks. Kevin. --- >From dba3230859f697c0e2078a2f1ba65b492cd690da Mon Sep 17 00:00:00 2001 From: Ivan Ilchenko Date: Sun, 1 Sep 2019 15:36:43 +0100 Subject: [PATCH] net/atlantic: remove double function declaration [ upstream commit 5fdd61136babc3ec4a371ed09372c551da3e79b3 ] atl_dev_info_get() is declared twice in atl_ethdev.c. Delete one of these declarations. Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop") Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko Acked-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_e= thdev.c index 06d4f2eae..623c7166e 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -44,7 +44,4 @@ static int atl_fw_version_get(struct rte_eth_dev *dev, ch= ar *fw_version, =09=09=09 size_t fw_size); =20 -static void atl_dev_info_get(struct rte_eth_dev *dev, -=09=09=09 struct rte_eth_dev_info *dev_info); - static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *de= v); =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:55.665864988 +0000 +++ 0008-net-atlantic-remove-double-function-declaration.patch=092019-11-22= 14:36:55.151150269 +0000 @@ -1 +1 @@ -From 5fdd61136babc3ec4a371ed09372c551da3e79b3 Mon Sep 17 00:00:00 2001 +From dba3230859f697c0e2078a2f1ba65b492cd690da Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5fdd61136babc3ec4a371ed09372c551da3e79b3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3c1b349df..4a99699ad 100644 +index 06d4f2eae..623c7166e 100644 @@ -23 +24 @@ -@@ -46,7 +46,4 @@ static int atl_fw_version_get(struct rte_eth_dev *dev, c= har *fw_version, +@@ -44,7 +44,4 @@ static int atl_fw_version_get(struct rte_eth_dev *dev, c= har *fw_version,