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 9C3F3A04DD for ; Wed, 28 Oct 2020 11:46:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 689F6CA02; Wed, 28 Oct 2020 11:46:17 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id E2E1FC9FC for ; Wed, 28 Oct 2020 11:46:14 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id w1so5155184wrm.4 for ; Wed, 28 Oct 2020 03:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fXJsyWMPW7mPU4WixmGutyaTGErRxbGmRsAbZ2DhGkI=; b=sEXoSNBBHAZzbh9xOiEn7+kQMr0nIslejLvnlYCba+3VtSH6VNmJgNTegwd/squ33W VZ5RE1PpgrBbh46mcRhvnlkoqGkWDv/KA3q484YTP1wmYb4P0rNdnpaXdWogxeCaL1vv BITZ+eBBgJzdavp1oNiglTcZWJ/bf0cx4bQVnkZD98zT5V31xGNjXEq/cxtbl2pEWVai DxrRrq5vo20ZmtOqbI4KikdknyvwdW/EeWqAVvrD/wKoo88T96yY+rosVnU891LYe1Ad fit5pzzOM2GVK/C6TAD+WD1QWXkOVEFtYzL4w+tjph3F3OHUaYiCvLwWgbXiqH1Al9Nh YwtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fXJsyWMPW7mPU4WixmGutyaTGErRxbGmRsAbZ2DhGkI=; b=i6kQvlDen0EdHHIqKtoXrIpe7BUY6oiKz8XzeHN32YadhZvWYbtrIcf++H4GMlS1d9 pbt9CfAJO3x9G9XsjRZK8K2hncMknol4X6sbDiJyvPncnAamcos/1t57zeWVlngWmk9X qeDoQUhYjFC/8EpyNTiKLoGt32JNxZHOphT7KTWvyb8gXoD5IKKcd7p1dCXUr4t69DUG IDdWKquWlqjAWkAIyjBikZILlQ54dhqG5uPfbH+FCdr/wHprb6InyTZThK73nBoj7252 6ydPH3EAaA7QPLvDuwR9nV61jLQJPwTiLLXg+yOZlVWeK1jNlD3Xh3vUBiVJsTBxW1rp TWMQ== X-Gm-Message-State: AOAM532csmSQx8GTfn24WZkmmFf3M07R27lQwPiyxTXtlhMc5xLz7D76 zZRpM/thSDPu2yKzA7miETI= X-Google-Smtp-Source: ABdhPJyCMJP7EGAtMpstWIHebPVeBjmYcuQXtIKeTUlGVBZoY94BcKFDtivff2v0SOM+n5nRK1s/jQ== X-Received: by 2002:adf:dfc7:: with SMTP id q7mr7845458wrn.382.1603881973609; Wed, 28 Oct 2020 03:46:13 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u195sm6564576wmu.18.2020.10.28.03.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:13 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Andrew Rybchenko , dpdk stable Date: Wed, 28 Oct 2020 10:42:41 +0000 Message-Id: <20201028104606.3504127-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to stable release 19.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 stable release 19.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 10/30/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. Thanks. Luca Boccassi --- >From b4b613b2b4a6a91ae42a78f6993bcf8fd1e6f492 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 af1c7ae5fe..9d14769a7e 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -15,8 +15,6 @@ extern struct rte_pci_bus rte_pci_bus; 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 * list -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:11.863307471 +0000 +++ 0002-bus-pci-remove-duplicate-declaration.patch 2020-10-28 10:35:11.376828139 +0000 @@ -1,12 +1,13 @@ -From f252fe5e18e060e2b79f193d21d80e2dbbf743be Mon Sep 17 00:00:00 2001 +From b4b613b2b4a6a91ae42a78f6993bcf8fd1e6f492 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") -Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Andrew Rybchenko @@ -15,7 +16,7 @@ 1 file changed, 2 deletions(-) diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h -index fadc767236..16f997c701 100644 +index af1c7ae5fe..9d14769a7e 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -15,8 +15,6 @@ extern struct rte_pci_bus rte_pci_bus;