From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8827CA0524 for ; Fri, 5 Feb 2021 12:19:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81EC54067B; Fri, 5 Feb 2021 12:19:36 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 4B3571606BA for ; Fri, 5 Feb 2021 12:19:35 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id a1so7274215wrq.6 for ; Fri, 05 Feb 2021 03:19:35 -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=0AXSDG2RX1d/NaWjbuQzUSlI1vL1sCILIFZTV6rYSvg=; b=t2la+cmYVCzuJ5qRBPqu2yCUtylYjxOqqJwYbprZS/3zGg7vO+J53/9WxlsRRRoVtN +BPmFu9I/iDr0N8ynSS38aWxBpJCwjanxEfb/ucrkBQnGmPb8BgxYuBmmxM+fQmJ5Mf6 p53/kxZql0RiYqbG1j0rl4iGjde3u5oa8VeSnY2fxJo459YX/q2/3erR5gZ804fnbAEp 3Yfwj2d6VxKBvaBibJEPDaeErwHERAFoO3X8yeaXA34SOvnVzFtgpQ3wy/DyBgWs6FLy tAs0aABAEdqyKKsoVum+C+fT2NJ9AmhnfXvbsEOlRK8mP6jEetyBw+rtsY+AVg3JWk4f 2RyQ== 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=0AXSDG2RX1d/NaWjbuQzUSlI1vL1sCILIFZTV6rYSvg=; b=cs8FJ8II0TbeabVx9JgUCF7i/WXo0FCbO7lZtkWHPSvM8dgGfeWAl34lYHvDRocf3m un728yZ3w/+F2n2cXzFQ5WRlN0dfaQZ/iwT9eja5VI+GUQ0PiljIvBt7UWLvQL8FiVNx CUvENetID0S+DL2T8h7qz3P67Pw08sb3ViPZQD/RI5aVg9vdrHoP7wB6L4LC02IIWSSt DuowA27snZCZ1uVtxMOFsJkiSJ7jvOfZG8hp2FQlHYxr04aeMkJljpAKa99EFabsR2sO zyKBNSSfsuGhfsRVh5ixvPRs5qx4tBsMcRuWjw5aRDmAiG0Ph3OUeEifcpSADcLdmTyC cAtQ== X-Gm-Message-State: AOAM532KrTDq1q1DBXxXswUrop+0uwGiVcIQmJA+wIHP2GY1Ikn0QcKA ySPk/qD4cnSJxkLRmctOzTo0GfA3jg61cg== X-Google-Smtp-Source: ABdhPJxfO4ZTwDMu58UJhMj1ElcoUwNo7TgR4vPXji5CDV/GsGF//5BVLZL5LnARc+GNPEEGNpEl6g== X-Received: by 2002:adf:cf04:: with SMTP id o4mr4474235wrj.412.1612523975056; Fri, 05 Feb 2021 03:19:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n9sm12205831wrq.41.2021.02.05.03.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:19:34 -0800 (PST) From: luca.boccassi@gmail.com To: John McNamara Cc: Bruce Richardson , dpdk stable Date: Fri, 5 Feb 2021 11:14:51 +0000 Message-Id: <20210205111920.1272063-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'license: add licenses for exception cases' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/862b67bcbdb0aad602ab8a340a75e1b94270fd41 Thanks. Luca Boccassi --- >From 862b67bcbdb0aad602ab8a340a75e1b94270fd41 Mon Sep 17 00:00:00 2001 From: John McNamara Date: Wed, 2 Dec 2020 19:01:40 +0000 Subject: [PATCH] license: add licenses for exception cases [ upstream commit 3745f64b4a3559ac817ca08e85108aa1f161c6fa ] The license/exceptions.txt file lists a small number of files that have licenses that are exceptions to the three main licenses defined in the Intellectual Property Policy of the DPDK Charter. The three exception licenses are MIT, ISC and BSD-2-Clause. Each of these licenses states that the content of the license message should be included in the code distribution. This change adds the text of the MIT, ISC and BSD-2-Clause licenses as defined on the SPDX website. Signed-off-by: John McNamara Acked-by: Bruce Richardson --- license/bsd-2-clause.txt | 20 ++++++++++++++++++++ license/isc.txt | 11 +++++++++++ license/mit.txt | 18 ++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 license/bsd-2-clause.txt create mode 100644 license/isc.txt create mode 100644 license/mit.txt diff --git a/license/bsd-2-clause.txt b/license/bsd-2-clause.txt new file mode 100644 index 0000000000..dfb3f1adea --- /dev/null +++ b/license/bsd-2-clause.txt @@ -0,0 +1,20 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. 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. + +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 HOLDER 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/license/isc.txt b/license/isc.txt new file mode 100644 index 0000000000..34a6a760d5 --- /dev/null +++ b/license/isc.txt @@ -0,0 +1,11 @@ +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. diff --git a/license/mit.txt b/license/mit.txt new file mode 100644 index 0000000000..c4037a4605 --- /dev/null +++ b/license/mit.txt @@ -0,0 +1,18 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:29.572775978 +0000 +++ 0005-license-add-licenses-for-exception-cases.patch 2021-02-05 11:18:28.582686848 +0000 @@ -1 +1 @@ -From 3745f64b4a3559ac817ca08e85108aa1f161c6fa Mon Sep 17 00:00:00 2001 +From 862b67bcbdb0aad602ab8a340a75e1b94270fd41 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3745f64b4a3559ac817ca08e85108aa1f161c6fa ] + @@ -16,2 +17,0 @@ - -Cc: stable@dpdk.org