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 00DCEA04DD for ; Wed, 28 Oct 2020 11:47:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EC90C2C2A; Wed, 28 Oct 2020 11:47:36 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id 793722C2A for ; Wed, 28 Oct 2020 11:47:34 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id c194so4077879wme.2 for ; Wed, 28 Oct 2020 03:47:34 -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=SIm1D8HBdFac6OQ9LjTyYEE0fcbT5wfIc6VqrE7KG0E=; b=dVmVgywmHMbzkwCMBwpP6Br2MaMqNVAFbg9EQO1W598tEiDMiqn8JfrnIiC9iKwQZL TRvASS4JLfDEeLhPhS6sZtcevHCEyHQDvAsDTgXhuWWdAEc9H908iFAMDEld0tEfiwG+ gIa+oKigZ0nLc7x5biDAAVF7x6QNvGWbuKvGfqSLqe2Tvb6MR/692zw8O+doNd/7siCu uvtnPiYp3C2LWy7mBXO2gy1BRnv/WdMcGNJ83lOr/vS4jxPRASHI9fgFktEtgrJeqiH2 gxXWlKCKIwG/8/Do43Xi0kO6i2AxbBKb5uj0QyMp30j83PtTjYiJVpdt+7kgNw49I5Pk +2MA== 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=SIm1D8HBdFac6OQ9LjTyYEE0fcbT5wfIc6VqrE7KG0E=; b=ekWW8yCX3TLAsEa89ZP8jjnSnNlj01r4CihHtKGQj1IntE6olN9bXMaeOc9B4qktHJ 6grwufYDwMks/qT2M9tBKFjSY2pN9jxOj8nu2LHwig0q8797sxvZk3JINjnj1JXbkYQS 96ZIC1E0TeEIHXE0Zm3YVVxwxcxWo0t3NTt5lAHrR5zQ0d6Ps96qb22DA/dKq3Qgnj8s 4zWwiGayNM1AwSGRlZrG5r+awFwoXImuLsEGhurRtb73apisQfgcSFm3GiBnhthQ26Tc pE4A1PNiq7DqwNNZ4QGNjxnvhjvrSaeJjQyi7cDQyAmHR9y34VJA1cmXQjLEYmviKQvo fahw== X-Gm-Message-State: AOAM530AEKghj324D0WOw6E0nwsuSVTfdQZ3ZoOuaR763hlq2cR1dAOy hV0h+DWNMrprQw2aqJf6ZcY= X-Google-Smtp-Source: ABdhPJwiMKXqtLYJBRQX80oNKoE/G56U5NP4OpfVOcY158xiyQhrz9fzA41kxqDFd/RA3Efh2u+2Tg== X-Received: by 2002:a1c:1fd1:: with SMTP id f200mr4564209wmf.68.1603882053255; Wed, 28 Oct 2020 03:47:33 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y2sm6466454wrh.0.2020.10.28.03.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:47:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Stephen Hemminger , Andrew Rybchenko , Jan Blunck , dpdk stable Date: Wed, 28 Oct 2020 10:43:05 +0000 Message-Id: <20201028104606.3504127-26-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 'ethdev: remove redundant license text' 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 34507c3b03d78a4c3110ccb3d2888b33a12826bb Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 10 Sep 2020 12:08:48 +0100 Subject: [PATCH] ethdev: remove redundant license text [ upstream commit b895a521f96585e6fe42a248b89e38cc1da81596 ] Redundant BSD-3 license text removed, the licensing already documented by "SPDX-License-Identifier: BSD-3-Clause" SPDX tag. Reported-by: Stephen Hemminger Signed-off-by: Ferruh Yigit Acked-by: Andrew Rybchenko --- lib/librte_ethdev/rte_ethdev_pci.h | 26 -------------------------- lib/librte_ethdev/rte_ethdev_vdev.h | 26 -------------------------- 2 files changed, 52 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h index cca94ec864..d44a8e2a39 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -3,32 +3,6 @@ * * Copyright(c) 2017 Brocade Communications Systems, Inc. * Author: Jan Blunck - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _RTE_ETHDEV_PCI_H_ diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h index 259feda3f7..0abce0d21c 100644 --- a/lib/librte_ethdev/rte_ethdev_vdev.h +++ b/lib/librte_ethdev/rte_ethdev_vdev.h @@ -3,32 +3,6 @@ * * Copyright(c) 2017 Brocade Communications Systems, Inc. * Author: Jan Blunck - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _RTE_ETHDEV_VDEV_H_ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.602561809 +0000 +++ 0026-ethdev-remove-redundant-license-text.patch 2020-10-28 10:35:11.452829258 +0000 @@ -1,13 +1,13 @@ -From b895a521f96585e6fe42a248b89e38cc1da81596 Mon Sep 17 00:00:00 2001 +From 34507c3b03d78a4c3110ccb3d2888b33a12826bb Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 10 Sep 2020 12:08:48 +0100 Subject: [PATCH] ethdev: remove redundant license text +[ upstream commit b895a521f96585e6fe42a248b89e38cc1da81596 ] + Redundant BSD-3 license text removed, the licensing already documented by "SPDX-License-Identifier: BSD-3-Clause" SPDX tag. -Cc: stable@dpdk.org - Reported-by: Stephen Hemminger Signed-off-by: Ferruh Yigit Acked-by: Andrew Rybchenko @@ -17,12 +17,12 @@ 2 files changed, 52 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h -index 6ac6ea41f5..9c483468ba 100644 +index cca94ec864..d44a8e2a39 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h -@@ -1,32 +1,6 @@ - /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2017 Brocade Communications Systems, Inc. +@@ -3,32 +3,6 @@ + * + * Copyright(c) 2017 Brocade Communications Systems, Inc. * Author: Jan Blunck - * - * Redistribution and use in source and binary forms, with or without @@ -54,12 +54,12 @@ #ifndef _RTE_ETHDEV_PCI_H_ diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h -index 64fa689ed3..4ba3f28964 100644 +index 259feda3f7..0abce0d21c 100644 --- a/lib/librte_ethdev/rte_ethdev_vdev.h +++ b/lib/librte_ethdev/rte_ethdev_vdev.h -@@ -1,32 +1,6 @@ - /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2017 Brocade Communications Systems, Inc. +@@ -3,32 +3,6 @@ + * + * Copyright(c) 2017 Brocade Communications Systems, Inc. * Author: Jan Blunck - * - * Redistribution and use in source and binary forms, with or without