[dpdk-stable] patch 'ethdev: remove redundant license text' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Oct 28 11:43:05 CET 2020


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 <ferruh.yigit at intel.com>
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 <stephen at networkplumber.org>
Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 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 <jblunck at infradead.org>
- *
- *   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 <jblunck at infradead.org>
- *
- *   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 <ferruh.yigit at intel.com>
 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 at dpdk.org
-
 Reported-by: Stephen Hemminger <stephen at networkplumber.org>
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -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 <jblunck at infradead.org>
 - *
 - *   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 <jblunck at infradead.org>
 - *
 - *   Redistribution and use in source and binary forms, with or without


More information about the stable mailing list