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 69AE3A04B1 for ; Thu, 5 Nov 2020 13:40:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AB324C31B; Thu, 5 Nov 2020 13:40:51 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 84A30C31B for ; Thu, 5 Nov 2020 13:40:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580049; 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=zot8ZetIbwuCW6GLjB+fWpRt9CkTpna4qpwiCFb2Oe8=; b=c7lz5gjEU44mdgBBuy2KKeSm1Pc56pkQ5pAZdFzg7aMQmDQ4pR65xfKygL4+2x2bnDsZxq 7wFM3wfX38/vYcwHhSZzngEeNY25Xa8zlAXy1wl8DIGopULrzl9MaEZbpe9M2xXqVnsrXS HojqYBSvPKcB70V/gBBkDFaIHQtLM5I= 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-384-wnEoc7tmOL6PxuedQSgFDA-1; Thu, 05 Nov 2020 07:40:45 -0500 X-MC-Unique: wnEoc7tmOL6PxuedQSgFDA-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 2C5EA6415B; Thu, 5 Nov 2020 12:40:44 +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 B0E235C645; Thu, 5 Nov 2020 12:40:42 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Stephen Hemminger , Andrew Rybchenko , Jan Blunck , dpdk stable Date: Thu, 5 Nov 2020 12:39:15 +0000 Message-Id: <20201105124015.306404-8-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <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 'ethdev: remove redundant license text' 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/7a1fbba865970b8e351c16e6e3fb9f22fba4ef46 Thanks. Kevin. --- >From 7a1fbba865970b8e351c16e6e3fb9f22fba4ef46 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 @@ -4,30 +4,4 @@ * 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. */ 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 @@ -4,30 +4,4 @@ * 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. */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.420023267 +0000 +++ 0008-ethdev-remove-redundant-license-text.patch 2020-11-05 12:38:54.155895954 +0000 @@ -1 +1 @@ -From b895a521f96585e6fe42a248b89e38cc1da81596 Mon Sep 17 00:00:00 2001 +From 7a1fbba865970b8e351c16e6e3fb9f22fba4ef46 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b895a521f96585e6fe42a248b89e38cc1da81596 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -20 +20 @@ -index 6ac6ea41f5..9c483468ba 100644 +index cca94ec864..d44a8e2a39 100644 @@ -23,2 +23,2 @@ -@@ -2,30 +2,4 @@ - * Copyright(c) 2017 Brocade Communications Systems, Inc. +@@ -4,30 +4,4 @@ + * Copyright(c) 2017 Brocade Communications Systems, Inc. @@ -55 +55 @@ -index 64fa689ed3..4ba3f28964 100644 +index 259feda3f7..0abce0d21c 100644 @@ -58,2 +58,2 @@ -@@ -2,30 +2,4 @@ - * Copyright(c) 2017 Brocade Communications Systems, Inc. +@@ -4,30 +4,4 @@ + * Copyright(c) 2017 Brocade Communications Systems, Inc.