Hi, On Wed, Jan 24, 2018 at 01:20:16PM +0000, Lee Daly wrote: > This updates the Intel and Oliver Matz licenses on files 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. > > Signed-off-by: Lee Daly <lee.d...@intel.com> > --- > examples/ip_pipeline/parser.c | 56 > +++---------------------------------------- > 1 file changed, 3 insertions(+), 53 deletions(-) > > diff --git a/examples/ip_pipeline/parser.c b/examples/ip_pipeline/parser.c > index 689e206..39dd1ee 100644 > --- a/examples/ip_pipeline/parser.c > +++ b/examples/ip_pipeline/parser.c > @@ -1,34 +1,6 @@ > -/*- > - * 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. > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2016 Intel Corporation.
I think the line: * Copyright (c) 2009, Olivier MATZ <z...@droids-corp.org> should go here, not in another comment block below. > + * All rights reserved. > */ > > /* > @@ -36,28 +8,6 @@ > * > * Copyright (c) 2009, Olivier MATZ <z...@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 >