All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Daly <lee.daly@intel.com>
To: cristian.dumitrescu@intel.com, olivier.matz@6wind.com
Cc: dev@dpdk.org, ferruh.yigit@intel.com, Lee Daly <lee.daly@intel.com>
Subject: [PATCH v4] examples/ip_pipeline: update copyright and license
Date: Wed,  7 Feb 2018 16:43:59 +0000	[thread overview]
Message-ID: <1518021839-123634-1-git-send-email-lee.daly@intel.com> (raw)
In-Reply-To: <1518020934-122711-1-git-send-email-lee.daly@intel.com>

This updates the Intel and Oliver Matz licenses on a file in examples
to be the standard BSD-3-Clause license used for the rest of DPDK,
bringing the files in compliance with the DPDK licensing policy.

---

V2: Combined Intel and Olivier Matz license blocks
V3: Removed all right reserved from Intel license
V4: Merge V2 and V3

Signed-off-by: Lee Daly <lee.daly@intel.com>

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 examples/ip_pipeline/parser.c | 60 ++-----------------------------------------
 1 file changed, 2 insertions(+), 58 deletions(-)

diff --git a/examples/ip_pipeline/parser.c b/examples/ip_pipeline/parser.c
index 689e206..0901e9c 100644
--- a/examples/ip_pipeline/parser.c
+++ b/examples/ip_pipeline/parser.c
@@ -1,63 +1,7 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2016 Intel 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 Intel 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.
- */
-
-/*
- * For my_ether_aton() function:
- *
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2016 Intel Corporation.
  * Copyright (c) 2009, Olivier MATZ <zer0@droids-corp.org>
  * 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 the University of California, Berkeley 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 REGENTS 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 REGENTS AND 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.7.4

  reply	other threads:[~2018-02-07 16:44 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-17 14:39 [PATCH] examples: update copyright and license Lee Daly
2018-01-22 12:48 ` Olivier Matz
2018-01-22 12:57 ` Hemant Agrawal
2018-01-23 16:43 ` [PATCH] examples/cmdline: " Lee Daly
2018-02-07 16:15   ` Ferruh Yigit
2018-02-12 10:16     ` Olivier Matz
2018-02-13 22:25       ` Thomas Monjalon
2018-01-23 16:44 ` [PATCH] examples/ip_pipeline: " Lee Daly
2018-01-23 17:08   ` Bruce Richardson
2018-01-24 13:20   ` Lee Daly
2018-01-26  9:24     ` Olivier Matz
2018-01-29 13:32     ` [PATCH v2] " Lee Daly
2018-02-07 16:28       ` [PATCH v3] " Lee Daly
2018-02-07 16:43         ` Lee Daly [this message]
2018-02-08  8:31           ` [PATCH v4] " Hemant Agrawal
2018-02-12 10:15           ` Olivier Matz
2018-02-13 22:28             ` Thomas Monjalon
2018-01-24 13:27   ` [PATCH] examples: update copyrights " Lee Daly
2018-02-07 16:15     ` Ferruh Yigit
2018-02-07 16:24     ` Jerin Jacob
2018-02-08  8:29     ` Hemant Agrawal
2018-02-08 14:03     ` [PATCH v2] examples/performance-thread: " Lee Daly
2018-02-08 14:55       ` Ferruh Yigit
2018-02-08 21:36         ` Thomas Monjalon
2018-01-23 16:45 ` [PATCH] examples/l3fwd: update copyright " Lee Daly
2018-02-07 16:15   ` Ferruh Yigit
2018-02-08 21:47     ` Thomas Monjalon
2018-01-23 16:45 ` [PATCH] examples/l3fwd: update copyright and licenses Lee Daly
2018-02-07 16:15   ` Ferruh Yigit
2018-02-08  8:35   ` Hemant Agrawal
2018-02-08  8:39     ` Hemant Agrawal
2018-05-25 10:07   ` Thomas Monjalon
2018-01-23 16:46 ` [PATCH] examples: update copyrights and license Lee Daly
2018-01-23 17:09   ` Bruce Richardson
2018-02-08  8:49   ` Hemant Agrawal
2018-02-08 13:48     ` Daly, Lee
2018-02-09  4:55       ` Hemant Agrawal
2018-02-09 14:30         ` Hasan Alayli
2018-02-09 15:09   ` Hemant Agrawal
2018-01-23 16:46 ` [PATCH] examples: update copyrights and licenses Lee Daly
2018-02-08  7:58 ` [PATCH] examples: update copyright and license Chao Zhu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1518021839-123634-1-git-send-email-lee.daly@intel.com \
    --to=lee.daly@intel.com \
    --cc=cristian.dumitrescu@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=olivier.matz@6wind.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.