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 333A2A0553 for ; Mon, 17 Feb 2020 18:46:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D04E1DA12; Mon, 17 Feb 2020 18:46:05 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id C0E4B1DAB4 for ; Mon, 17 Feb 2020 18:46:03 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id z7so20756275wrl.13 for ; Mon, 17 Feb 2020 09:46:03 -0800 (PST) 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=Ix8eZidabpHVT1fDIKuiZ6qyCJCX0lh4mlHrYbGSw/E=; b=iswqY3zjBhUdHbFmtM9oCtSlJylldV+epeIPtg9DvPaZcOKvuQJQM9MGt2s+deQhGP mGFYk8NRJVl1agrffNmISQsT6h3qloxdKnVyybj4iISj1Xkf8t77mn+ZY2vR7WN38sAr x2yA/MpnomMV/J7zf7IZhX6X75SDPMZs/mh3o5YnBRUFAkfJtfie/th0mCrIK75vFnWs 79vnKz81G4ZGmQR2mKn+KNs50gbLD8S0tyhHR3NAZJBSzOyH/KNlWM6ElXR0wOosrUo/ OAnrzkNvMudlgHMhikfw1V6gUfL/x6kt+e8wiL+pMGeQmeSYumxeZuh5AizAu4iPg1Ji nBtA== 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=Ix8eZidabpHVT1fDIKuiZ6qyCJCX0lh4mlHrYbGSw/E=; b=mNGQIUGsoAdKOqLORh0Jjp6yADqdJnuoZyKCPhivJunWy60NCfwKf/23MonC8FBDTN TU4+LUErVfua6HjFhDMbMzXdeQyYWTHKTU+f5jKHKl7Z6uFHJs3YU42F6YI8Urn0SuPQ TDL+nXAjSjDhbwf22zxTUYeAxuZFdcU8m8T2W2uPQKvlokae9d89OJ/1/tCpVdycza0m 0wzVnd09+3o2If3jk83HYnCHikBvRD5qB7t4vNDyKds4e6hF5eGkWkfMm9qq+Q/YEXbl s+ABanHHGE8/lUxPnJu3yj3gqzAkTuZPIKGG3TlcKbUmaVMKvomRsAAHNHzaDnGoe+jy gVjw== X-Gm-Message-State: APjAAAV2ioZKzMKyavoF8Nx+/mztoME7TNe2G36iMvpfRNcdnpipPI5x SnCu7fC2KlLHjRXpaIjyWRONlverWNI= X-Google-Smtp-Source: APXvYqwgsGD6hx1VZ2MK2FQ7z8D8sgVu8Uuw7LavPIciDCU6wu0sUDpYNPyhbR/0p37D2xqstOQooQ== X-Received: by 2002:a5d:6789:: with SMTP id v9mr24575014wru.55.1581961563488; Mon, 17 Feb 2020 09:46:03 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id q124sm711137wme.2.2020.02.17.09.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:02 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Date: Mon, 17 Feb 2020 17:45:00 +0000 Message-Id: <20200217174546.25334-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'fix Mellanox copyright and SPDX tag' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/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 69aa29901aefb56c864161744663dfb85fa8b9eb Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sun, 9 Feb 2020 22:14:52 +0100 Subject: [PATCH] fix Mellanox copyright and SPDX tag [ upstream commit 80139e35493286bce0568cee03f58762b4051120 ] Mellanox owns Tilera and EZchip, so the copyrights can be converted. At the same time, the license header is switched to SPDX tag format, and a typo is fixed in another copyright line. Signed-off-by: Thomas Monjalon --- app/test-pmd/flowgen.c | 34 ++-------------------------------- app/test-pmd/macswap.c | 33 ++------------------------------- app/test-pmd/util.c | 2 +- devtools/cocci.sh | 32 ++------------------------------ 4 files changed, 7 insertions(+), 94 deletions(-) diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 03b72aaa56..68931fdea6 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -1,35 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Tilera Corporation. All rights reserved. - * All rights reserved. - * - * 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 Tilera Corporation 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. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2014-2020 Mellanox Technologies, Ltd */ #include diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c index 71af916fc3..8428c26d85 100644 --- a/app/test-pmd/macswap.c +++ b/app/test-pmd/macswap.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2014 Tilera Corporation. All rights reserved. - * - * 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 Tilera Corporation 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. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2014-2020 Mellanox Technologies, Ltd */ #include diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index b514be5e16..4e4ead3075 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation - * Copyright(c) 2018 Mellanox Technology + * Copyright 2018 Mellanox Technologies, Ltd */ #include diff --git a/devtools/cocci.sh b/devtools/cocci.sh index 8b17a8ceba..ab9a6efe9a 100755 --- a/devtools/cocci.sh +++ b/devtools/cocci.sh @@ -1,34 +1,6 @@ #! /bin/sh - -# BSD LICENSE -# -# Copyright 2015 EZchip Semiconductor Ltd. -# -# 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 EZchip Semiconductor 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. +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2015-2020 Mellanox Technologies, Ltd # Apply coccinelle transforms. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:15.577232481 +0000 +++ 0008-fix-Mellanox-copyright-and-SPDX-tag.patch 2020-02-17 17:00:15.275950002 +0000 @@ -1,8 +1,10 @@ -From 80139e35493286bce0568cee03f58762b4051120 Mon Sep 17 00:00:00 2001 +From 69aa29901aefb56c864161744663dfb85fa8b9eb Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sun, 9 Feb 2020 22:14:52 +0100 Subject: [PATCH] fix Mellanox copyright and SPDX tag +[ upstream commit 80139e35493286bce0568cee03f58762b4051120 ] + Mellanox owns Tilera and EZchip, so the copyrights can be converted. At the same time, the license header is switched to SPDX tag format, and a typo is fixed in another copyright line. @@ -16,7 +18,7 @@ 4 files changed, 7 insertions(+), 94 deletions(-) diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c -index ae50cdc9de..4bd351e675 100644 +index 03b72aaa56..68931fdea6 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -1,35 +1,5 @@ @@ -99,7 +101,7 @@ #include diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c -index 418d74e589..8488fa1a8f 100644 +index b514be5e16..4e4ead3075 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -1,6 +1,6 @@