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 07A92A04B1 for ; Thu, 5 Nov 2020 13:40:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EDB18C31B; Thu, 5 Nov 2020 13:40:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id CC12CC31B for ; Thu, 5 Nov 2020 13:40:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580039; 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; bh=Roc6fqSWOr+0lTD6d4HeNE5bKD2Jo1ID4r4BKNuQ0bM=; b=XJUQdu1rBZc/gZPgNT9wFEFMLGnXA7FSOPK9sFaQkKsELnMInmmCbMZzrTK211EZOBos1i 9hVdhXm/RwBUqFZAEy7yldVPs7353BrgayLk3KfkoeB27OznFxcKnk7cmxWuFqUk4leLXQ o2vSE1azdU2Y6DVnNr0HvYdPTd/CDU8= 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-527-ycPYDxUaPbi6JW_Ow8pYaw-1; Thu, 05 Nov 2020 07:40:34 -0500 X-MC-Unique: ycPYDxUaPbi6JW_Ow8pYaw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F90A186DD21; Thu, 5 Nov 2020 12:40:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 447A15C3E1; Thu, 5 Nov 2020 12:40:28 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Andrew Rybchenko , dpdk stable Date: Thu, 5 Nov 2020 12:39:08 +0000 Message-Id: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11 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.11 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/10/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 rebasing (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/5f9331ff0e72b4133361436d115477ae0049ebb2 Thanks. Kevin. --- >From 5f9331ff0e72b4133361436d115477ae0049ebb2 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 17 Sep 2020 13:28:23 +0200 Subject: [PATCH] bus/pci: remove duplicate declaration [ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ] This declaration is the same as the one a few lines before. Fixes: 6844d146ff39 ("eal: add bus pointer in device structure") Signed-off-by: David Marchand Acked-by: Andrew Rybchenko --- drivers/bus/pci/private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h index 22cefc8b93..9e1baf3efd 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -16,6 +16,4 @@ struct rte_pci_driver; struct rte_pci_device; -extern struct rte_pci_bus rte_pci_bus; - /** * Scan the content of the PCI bus, and the devices in the devices -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.296310124 +0000 +++ 0001-bus-pci-remove-duplicate-declaration.patch 2020-11-05 12:38:54.132895936 +0000 @@ -1 +1 @@ -From f252fe5e18e060e2b79f193d21d80e2dbbf743be Mon Sep 17 00:00:00 2001 +From 5f9331ff0e72b4133361436d115477ae0049ebb2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index fadc767236..16f997c701 100644 +index 22cefc8b93..9e1baf3efd 100644