ack On Tue, Feb 13, 2018 at 7:12 AM, Lee Daly <lee.d...@intel.com> wrote:
> This updates hasan alayli's license 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> > --- > .../performance-thread/common/arch/x86/stack.h | 40 > ++++------------------ > 1 file changed, 7 insertions(+), 33 deletions(-) > > diff --git a/examples/performance-thread/common/arch/x86/stack.h > b/examples/performance-thread/common/arch/x86/stack.h > index edf21c0..ee78ba2 100644 > --- a/examples/performance-thread/common/arch/x86/stack.h > +++ b/examples/performance-thread/common/arch/x86/stack.h > @@ -1,37 +1,11 @@ > -/* SPDX-License-Identifier: BSD-3-Clause > - * Copyright(c) 2015 Intel Corporation. > - * Copyright(c) Cavium, Inc. 2017. > - * All rights reserved. > - */ > - > -/* > - * Some portions of this software is derived from the > - * https://github.com/halayli/lthread which carrys the following license. > - * > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2015 Intel Corporation. > + * Copyright(c) Cavium, Inc. 2017. > + * All rights reserved > * Copyright (C) 2012, Hasan Alayli <hala...@gmail.com> > - * > - * 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 AUTHOR 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 AUTHOR 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. > - */ > - > + * Portions derived from: https://github.com/halayli/lthread > + * With permissions from Hasan Alayli to use them as BSD-3-Clause > +*/ > > #ifndef STACK_H > #define STACK_H > -- > 2.7.4 > >
