>On 9/14/2017 7:32 PM, Kumar, Ravi1 wrote: >>> Hi Ravi, >>> ' >>> On 9/13/2017 11:17 PM, Ravi Kumar wrote: >>>> Signed-off-by: Ravi Kumar <ravi1.ku...@amd.com> >>>> --- >>>> doc/guides/nics/axgbe.rst | 214 >>>> +++++++++++++++++++++++++++++++++++++ >>>> doc/guides/nics/features/axgbe.ini | 18 ++++ >>>> doc/guides/nics/index.rst | 1 + >>>> 3 files changed, 233 insertions(+) >>>> create mode 100644 doc/guides/nics/axgbe.rst create mode 100644 >>>> doc/guides/nics/features/axgbe.ini >>>> >>>> diff --git a/doc/guides/nics/axgbe.rst b/doc/guides/nics/axgbe.rst >>>> new file mode 100644 index 0000000..97056fa >>>> --- /dev/null >>>> +++ b/doc/guides/nics/axgbe.rst >>>> @@ -0,0 +1,214 @@ >>>> +.. Copyright (c) 2017 Advanced Micro Devices, Inc. >>>> + All rights reserved. >>>> + >>>> + AMD 10Gb Ethernet driver >>>> + >>>> + This file is available to you under your choice of the following two >>>> + licenses: >>> >>> will it be possible for you make these consistent with other DPDK Dual >>> license plate formats? >>> e.g. >>> ./drivers/crypto/qat/qat_adf/qat_algs.h >>> or, >>> ./drivers/crypto/dpaa2_sec/mc/dpseci.c >> >> Hi Hemant, >> >> By format do you mean wordings of the license have to change? >> >> Regards, >> Ravi >> > >I meant following: > >1. As a non-written convention, we are adding following statement in the top >of such dual licensed files : " This file is provided under a dual >BSD/GPLv2 license. When using or redistributing this file, you may do so under >either license.". And license header as "BSD LICENSE" or "GPL .." > >2. you are using a modified version of BSD. Typical license in DPDK files are >BSD-3 or BSD-2. If you intend to use your specific version of BSD license, it >will require TechBoard, Gov Board and legal approval. > >3. Additionally your BSD license is including a proprietary license text of >Synopsys. This will also need approval before it get included in DPDK. > >4. It seems you have copy pasted the same license text in all the files. >e.g. do you intend to keep dual license option + Synopsys text for your >documentation and the files, which you have created originally for dpdk only. >
Hi Hemant, Thank you very much for the detailed explanation. We have to work with our Legal team on this. We will get back to you. Regards, Ravi > >>> >>> >>>> + >>>> + License 1: GPLv2 >>>> + >>>> + Copyright (c) 2017 Advanced Micro Devices, Inc. >>>> + >>>> + This file is free software; you may copy, redistribute and/or modify >>>> + it under the terms of the GNU General Public License as published by >>>> + the Free Software Foundation, either version 2 of the License, or (at >>>> + your option) any later version. >>>> + >>>> + This file is distributed in the hope that it will be useful, but >>>> + WITHOUT ANY WARRANTY; without even the implied warranty of >>>> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >>>> + General Public License for more details. >>>> + >>>> + You should have received a copy of the GNU General Public License >>>> + along with this program. If not, see <http://www.gnu.org/licenses/>. >>>> + >>>> + This file incorporates work covered by the following copyright and >>>> + permission notice: >>>> + >>>> + Copyright (c) 2013 Synopsys, Inc. >>>> + >>>> + The Synopsys DWC ETHER XGMAC Software Driver and documentation >>>> + (hereinafter "Software") is an unsupported proprietary work of >>>> Synopsys, >>>> + Inc. unless otherwise expressly agreed to in writing between Synopsys >>>> + and you. >>>> + >>>> + The Software IS NOT an item of Licensed Software or Licensed Product >>>> + under any End User Software License Agreement or Agreement for >>>> Licensed >>>> + Product with Synopsys or any supplement thereto. Permission is hereby >>>> + granted, free of charge, to any person obtaining a copy of this >>>> software >>>> + annotated with this license and 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 shall be >>>> included >>>> + in all copies or substantial portions of the Software. >>>> + >>>> + THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" >>>> + BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >>>> LIMITED >>>> + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >>>> + PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS >>>> + 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. >>>> + >>>> + License 2: Modified BSD >>>> + >>>> + Copyright (c) 2017 Advanced Micro Devices, Inc. >>>> + 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 Advanced Micro Devices, Inc. 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 <COPYRIGHT HOLDER> 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. >>>> + >>>> + This file incorporates work covered by the following copyright and >>>> + permission notice: >>>> + >>>> + Copyright (c) 2013 Synopsys, Inc. >>>> + >>>> + The Synopsys DWC ETHER XGMAC Software Driver and documentation >>>> + (hereinafter "Software") is an unsupported proprietary work of >>>> Synopsys, >>>> + Inc. unless otherwise expressly agreed to in writing between Synopsys >>>> + and you. >>>> + >>>> + The Software IS NOT an item of Licensed Software or Licensed Product >>>> + under any End User Software License Agreement or Agreement for >>>> Licensed >>>> + Product with Synopsys or any supplement thereto. Permission is hereby >>>> + granted, free of charge, to any person obtaining a copy of this >>>> software >>>> + annotated with this license and 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 shall be >>>> included >>>> + in all copies or substantial portions of the Software. >>>> + >>>> + THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" >>>> + BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >>>> LIMITED >>>> + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >>>> + PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS >>>> + 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. >>>> +
