| Message ID | 1523264319-26429-5-git-send-email-hemant.agrawal@nxp.com |
|---|---|
| State | Accepted |
| Commit | 9c75ffc4e6a4a992712ecc92b6451291366ea519 |
| Headers | show |
| Series | usertools: change to SPDX license identifier | expand |
-----Original Message----- > Date: Mon, 9 Apr 2018 14:28:37 +0530 > From: Hemant Agrawal <hemant.agrawal@nxp.com> > To: dev@dpdk.org > CC: jerin.jacob@caviumnetworks.com, Hemant Agrawal <hemant.agrawal@nxp.com> > Subject: [PATCH] usertools: change to SPDX license identifier > X-Mailer: git-send-email 2.7.4 > > Cc: jerin.jacob@caviumnetworks.com > > Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com> Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com> > --- > usertools/cpu_layout.py | 36 +++--------------------------------- > 1 file changed, 3 insertions(+), 33 deletions(-) > > diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py > index d3c8eba..6f129b1 100755 > --- a/usertools/cpu_layout.py > +++ b/usertools/cpu_layout.py > @@ -1,38 +1,8 @@ > #!/usr/bin/env python > +# SPDX-License-Identifier: BSD-3-Clause > +# Copyright(c) 2010-2014 Intel Corporation > +# Copyright(c) 2017 Cavium, Inc. All rights reserved. > > -# > -# BSD LICENSE > -# > -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. > -# Copyright(c) 2017 Cavium, Inc. 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. > -# > from __future__ import print_function > import sys > try: > -- > 2.7.4 >
09/04/2018 11:07, Jerin Jacob: > -----Original Message----- > > Date: Mon, 9 Apr 2018 14:28:37 +0530 > > From: Hemant Agrawal <hemant.agrawal@nxp.com> > > To: dev@dpdk.org > > CC: jerin.jacob@caviumnetworks.com, Hemant Agrawal <hemant.agrawal@nxp.com> > > Subject: [PATCH] usertools: change to SPDX license identifier > > X-Mailer: git-send-email 2.7.4 > > > > Cc: jerin.jacob@caviumnetworks.com > > > > Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com> > > Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com> Applied, thanks
diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py index d3c8eba..6f129b1 100755 --- a/usertools/cpu_layout.py +++ b/usertools/cpu_layout.py @@ -1,38 +1,8 @@ #!/usr/bin/env python +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2017 Cavium, Inc. All rights reserved. -# -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# Copyright(c) 2017 Cavium, Inc. 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. -# from __future__ import print_function import sys try:
Cc: jerin.jacob@caviumnetworks.com Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com> --- usertools/cpu_layout.py | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) -- 2.7.4