From: "Leif Lindholm" <leif.lindholm@linaro.org>
To: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: devel@edk2.groups.io, Andrew Fish <afish@apple.com>,
Laszlo Ersek <lersek@redhat.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Michael Kubacki <michael.a.kubacki@intel.com>,
Ankit Sinha <ankit.sinha@intel.com>,
Chasel Chiu <chasel.chiu@intel.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Sai Chaganty <rangasai.v.chaganty@intel.com>,
Gillispie@bivouac.eciton.net, Thad <thad.gillispie@intel.com>,
Bu@bivouac.eciton.net, Daocheng <daocheng.bu@intel.com>,
Oram@bivouac.eciton.net, Isaac W <isaac.w.oram@intel.com>,
Zailiang Sun <zailiang.sun@intel.com>,
Yi Qian <yi.qian@intel.com>
Subject: Re: [edk2-non-osi] [PATCH 6/6] Cleanup maintainers, contributions, and licenses
Date: Fri, 26 Jul 2019 18:32:10 +0100 [thread overview]
Message-ID: <20190726173210.GD22656@bivouac.eciton.net> (raw)
In-Reply-To: <20190725173548.4716-7-nathaniel.l.desimone@intel.com>
On Thu, Jul 25, 2019 at 10:35:48AM -0700, Nate DeSimone wrote:
> - Merged Maintainers.txt from devel-MinPlatform branch with
> Maintainers.txt in master branch and updated to match the maintainers
> in the equivalent edk2-platforms Maintainers.txt
>
> - Removed the old Contributions.txt files
>
> - Updated the Kaby Lake microcode to the new Intel microcode license
> which Intel switched to in 2018
Looks good to me.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Gillispie, Thad <thad.gillispie@intel.com>
> Cc: Bu, Daocheng <daocheng.bu@intel.com>
> Cc: Oram, Isaac W <isaac.w.oram@intel.com>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> Contributions.txt | 163 -------------
> Maintainers.txt | 20 ++
> .../KabylakeSiliconBinPkg/Contributions.txt | 218 ------------------
> .../Intel/KabylakeSiliconBinPkg/License.txt | 6 +-
> .../Microcode/IntelMicrocodeLicense.txt | 37 +++
> 5 files changed, 60 insertions(+), 384 deletions(-)
> delete mode 100644 Contributions.txt
> delete mode 100644 Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> create mode 100644 Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMicrocodeLicense.txt
>
> diff --git a/Contributions.txt b/Contributions.txt
> deleted file mode 100644
> index 8cee4e2..0000000
> --- a/Contributions.txt
> +++ /dev/null
> @@ -1,163 +0,0 @@
> -======================
> -= Code Contributions =
> -======================
> -
> -To make a contribution to a TianoCore project, follow these steps.
> -1. Create a change description in the format specified below to
> - use in the source control commit log.
> -2. Your commit message must include your "Signed-off-by" signature,
> - and "Contributed-under" message.
> -3. Your "Contributed-under" message explicitly states that the
> - contribution is made under the terms of the specified
> - contribution agreement. Your "Contributed-under" message
> - must include the name of contribution agreement and version.
> - For example: Contributed-under: TianoCore Contribution Agreement 1.0
> - The "TianoCore Contribution Agreement" is included below in
> - this document.
> -4. Submit your code to the TianoCore project using the process
> - that the project documents on its web page. If the process is
> - not documented, then submit the code on development email list
> - for the project.
> -5. Contributions must have an explicit license, and the license must be
> - compatible with the contribution agreement. The license must be
> - available as a License.txt file alongside, or above in the directory
> - tree of, the contributed files.
> -
> -========================================
> -= TianoCore Contribution Agreement 1.1 =
> -========================================
> -
> -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DOCUMENTATION"),
> -INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE
> -PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE
> -TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE
> -TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR
> -REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE
> -CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS
> -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
> -BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
> -AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
> -AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
> -USE THE CONTENT.
> -
> -Unless otherwise indicated, all Content (except Documentation) made available on the TianoCore
> -site is provided to you under the terms and conditions of the BSD
> -License ("BSD"). A copy of the BSD License is available at
> -http://opensource.org/licenses/bsd-license.php
> -or when applicable, in the associated License.txt file.
> -
> -Unless otherwise indicated, all Documentation made available on the
> -TianoCore site is provided to you under the terms and conditions of the
> -FreeBSD Documentation License ("FreeBSD"). A copy of the BSD License is
> -available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,
> -when applicable, in the associated License.txt file.
> -
> -Certain other content may be made available under other licenses as
> -indicated in or with such Content(for example, in a License.txt file).
> -
> -You accept and agree to the following terms and conditions for Your
> -present and future Contributions submitted to TianoCore site. Except
> -for the license granted to Intel hereunder, You reserve all right,
> -title, and interest in and to Your Contributions.
> -
> -== SECTION 1: Definitions ==
> -* "You" or "Contributor" shall mean the copyright owner or legal
> - entity authorized by the copyright owner that is making a
> - Contribution hereunder. All other entities that control, are
> - controlled by, or are under common control with that entity are
> - considered to be a single Contributor. For the purposes of this
> - definition, "control" means (i) the power, direct or indirect, to
> - cause the direction or management of such entity, whether by
> - contract or otherwise, or (ii) ownership of fifty percent (50%)
> - or more of the outstanding shares, or (iii) beneficial ownership
> - of such entity.
> -* "Contribution" shall mean any original work of authorship,
> - including any modifications or additions to an existing work,
> - that is intentionally submitted by You to the TinaoCore site for
> - inclusion in, or documentation of, any of the Content. For the
> - purposes of this definition, "submitted" means any form of
> - electronic, verbal, or written communication sent to the
> - TianoCore site or its representatives, including but not limited
> - to communication on electronic mailing lists, source code
> - control systems, and issue tracking systems that are managed by,
> - or on behalf of, the TianoCore site for the purpose of
> - discussing and improving the Content, but excluding
> - communication that is conspicuously marked or otherwise
> - designated in writing by You as "Not a Contribution."
> -
> -== SECTION 2: License for Contributions ==
> -* Contributor hereby agrees that redistribution and use of the
> - Contribution 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 Contributor's
> - copyright notice, this list of conditions and the following
> - disclaimer.
> -** Redistributions in binary form must reproduce the Contributor's
> - copyright notice, this list of conditions and the following
> - disclaimer in the documentation and/or other materials provided
> - with the distribution.
> -* Disclaimer. None of the names of Contributor, Intel, or the names
> - of their respective contributors may be used to endorse or
> - promote products derived from this software without specific
> - prior written permission.
> -* Contributor grants a license (with the right to sublicense) under
> - claims of Contributor's patents that Contributor can license that
> - are infringed by the Contribution (as delivered by Contributor) to
> - make, use, distribute, sell, offer for sale, and import the
> - Contribution and derivative works thereof solely to the minimum
> - extent necessary for licensee to exercise the granted copyright
> - license; this patent license applies solely to those portions of
> - the Contribution that are unmodified. No hardware per se is
> - licensed.
> -* EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
> - CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "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
> - CONTRIBUTOR 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 THE
> - CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> - DAMAGE.
> -
> -== SECTION 3: Representations ==
> -* You represent that You are legally entitled to grant the above
> - license. If your employer(s) has rights to intellectual property
> - that You create that includes Your Contributions, You represent
> - that You have received permission to make Contributions on behalf
> - of that employer, that Your employer has waived such rights for
> - Your Contributions.
> -* You represent that each of Your Contributions is Your original
> - creation (see Section 4 for submissions on behalf of others).
> - You represent that Your Contribution submissions include complete
> - details of any third-party license or other restriction
> - (including, but not limited to, related patents and trademarks)
> - of which You are personally aware and which are associated with
> - any part of Your Contributions.
> -
> -== SECTION 4: Third Party Contributions ==
> -* Should You wish to submit work that is not Your original creation,
> - You may submit it to TianoCore site separately from any
> - Contribution, identifying the complete details of its source
> - and of any license or other restriction (including, but not
> - limited to, related patents, trademarks, and license agreements)
> - of which You are personally aware, and conspicuously marking the
> - work as "Submitted on behalf of a third-party: [named here]".
> -
> -== SECTION 5: Miscellaneous ==
> -* Applicable Laws. Any claims arising under or relating to this
> - Agreement shall be governed by the internal substantive laws of
> - the State of Delaware or federal courts located in Delaware,
> - without regard to principles of conflict of laws.
> -* Language. This Agreement is in the English language only, which
> - language shall be controlling in all respects, and all versions
> - of this Agreement in any other language shall be for accommodation
> - only and shall not be binding. All communications and notices made
> - or given pursuant to this Agreement, and all documentation and
> - support to be provided, unless otherwise noted, shall be in the
> - English language.
> diff --git a/Maintainers.txt b/Maintainers.txt
> index 4b1e1b5..9fba131 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -40,6 +40,26 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/Security
>
> EDK II Packages:
> ----------------
> +
> +Platform/Intel/ClevoOpenBoardBinPkg
> +M: Michael Kubacki <michael.a.kubacki@intel.com>
> +M: Ankit Sinha <ankit.sinha@intel.com>
> +M: Nate DeSimone <nathaniel.l.desimone@intel.com>
> +
> +Silicon/Intel/KabylakeSiliconBinPkg
> +M: Chasel Chiu <chasel.chiu@intel.com>
> +M: Michael A Kubacki <michael.a.kubacki@intel.com>
> +M: Sai Chaganty <rangasai.v.chaganty@intel.com>
> +
> +Silicon/Intel/PurleySiliconBinPkg
> +M: Gillispie, Thad <thad.gillispie@intel.com>
> +M: Bu, Daocheng <daocheng.bu@intel.com>
> +M: Oram, Isaac W <isaac.w.oram@intel.com>
> +
> Silicon/Intel/QuarkSocBinPkg
> M: Michael D Kinney <michael.d.kinney@intel.com>
> M: Kelly Steele <kelly.steele@intel.com>
> +
> +Silicon/Intel/Vlv2SocBinPkg
> +M: Zailiang Sun <zailiang.sun@intel.com>
> +M: Yi Qian <yi.qian@intel.com>
> diff --git a/Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt b/Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> deleted file mode 100644
> index f87cbd7..0000000
> --- a/Silicon/Intel/KabylakeSiliconBinPkg/Contributions.txt
> +++ /dev/null
> @@ -1,218 +0,0 @@
> -
> -======================
> -= Code Contributions =
> -======================
> -
> -To make a contribution to a TianoCore project, follow these steps.
> -1. Create a change description in the format specified below to
> - use in the source control commit log.
> -2. Your commit message must include your "Signed-off-by" signature,
> - and "Contributed-under" message.
> -3. Your "Contributed-under" message explicitly states that the
> - contribution is made under the terms of the specified
> - contribution agreement. Your "Contributed-under" message
> - must include the name of contribution agreement and version.
> - For example: Contributed-under: TianoCore Contribution Agreement 1.0
> - The "TianoCore Contribution Agreement" is included below in
> - this document.
> -4. Submit your code to the TianoCore project using the process
> - that the project documents on its web page. If the process is
> - not documented, then submit the code on development email list
> - for the project.
> -5. It is preferred that contributions are submitted using the same
> - copyright license as the base project. When that is not possible,
> - then contributions using the following licenses can be accepted:
> - * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
> - * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
> - * MIT: http://opensource.org/licenses/MIT
> - * Python-2.0: http://opensource.org/licenses/Python-2.0
> - * Zlib: http://opensource.org/licenses/Zlib
> -
> - Contributions of code put into the public domain can also be
> - accepted.
> -
> - Contributions using other licenses might be accepted, but further
> - review will be required.
> -
> -=====================================================
> -= Change Description / Commit Message / Patch Email =
> -=====================================================
> -
> -Your change description should use the standard format for a
> -commit message, and must include your "Signed-off-by" signature
> -and the "Contributed-under" message.
> -
> -== Sample Change Description / Commit Message =
> -
> -=== Start of sample patch email message ===
> -
> -From: Contributor Name <contributor@example.com>
> -Subject: [PATCH] CodeModule: Brief-single-line-summary
> -
> -Full-commit-message
> -
> -Contributed-under: TianoCore Contribution Agreement 1.0
> -Signed-off-by: Contributor Name <contributor@example.com>
> ----
> -
> -An extra message for the patch email which will not be considered part
> -of the commit message can be added here.
> -
> -Patch content inline or attached
> -
> -=== End of sample patch email message ===
> -
> -=== Notes for sample patch email ===
> -
> -* The first line of commit message is taken from the email's subject
> - line following [PATCH]. The remaining portion of the commit message
> - is the email's content until the '---' line.
> -* git format-patch is one way to create this format
> -
> -=== Definitions for sample patch email ===
> -
> -* "CodeModule" is a short idenfier for the affected code. For
> - example MdePkg, or MdeModulePkg UsbBusDxe.
> -* "Brief-single-line-summary" is a short summary of the change.
> -* The entire first line should be less than ~70 characters.
> -* "Full-commit-message" a verbose multiple line comment describing
> - the change. Each line should be less than ~70 characters.
> -* "Contributed-under" explicitely states that the contribution is
> - made under the terms of the contribtion agreement. This
> - agreement is included below in this document.
> -* "Signed-off-by" is the contributor's signature identifying them
> - by their real/legal name and their email address.
> -
> -========================================
> -= TianoCore Contribution Agreement 1.0 =
> -========================================
> -
> -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
> -INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE
> -PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE
> -TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE
> -TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR
> -REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE
> -CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS
> -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
> -BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
> -AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
> -AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
> -USE THE CONTENT.
> -
> -Unless otherwise indicated, all Content made available on the TianoCore
> -site is provided to you under the terms and conditions of the BSD
> -License ("BSD"). A copy of the BSD License is available at
> -http://opensource.org/licenses/bsd-license.php
> -or when applicable, in the associated License.txt file.
> -
> -Certain other content may be made available under other licenses as
> -indicated in or with such Content. (For example, in a License.txt file.)
> -
> -You accept and agree to the following terms and conditions for Your
> -present and future Contributions submitted to TianoCore site. Except
> -for the license granted to Intel hereunder, You reserve all right,
> -title, and interest in and to Your Contributions.
> -
> -== SECTION 1: Definitions ==
> -* "You" or "Contributor" shall mean the copyright owner or legal
> - entity authorized by the copyright owner that is making a
> - Contribution hereunder. All other entities that control, are
> - controlled by, or are under common control with that entity are
> - considered to be a single Contributor. For the purposes of this
> - definition, "control" means (i) the power, direct or indirect, to
> - cause the direction or management of such entity, whether by
> - contract or otherwise, or (ii) ownership of fifty percent (50%)
> - or more of the outstanding shares, or (iii) beneficial ownership
> - of such entity.
> -* "Contribution" shall mean any original work of authorship,
> - including any modifications or additions to an existing work,
> - that is intentionally submitted by You to the TinaoCore site for
> - inclusion in, or documentation of, any of the Content. For the
> - purposes of this definition, "submitted" means any form of
> - electronic, verbal, or written communication sent to the
> - TianoCore site or its representatives, including but not limited
> - to communication on electronic mailing lists, source code
> - control systems, and issue tracking systems that are managed by,
> - or on behalf of, the TianoCore site for the purpose of
> - discussing and improving the Content, but excluding
> - communication that is conspicuously marked or otherwise
> - designated in writing by You as "Not a Contribution."
> -
> -== SECTION 2: License for Contributions ==
> -* Contributor hereby agrees that redistribution and use of the
> - Contribution 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 Contributor's
> - copyright notice, this list of conditions and the following
> - disclaimer.
> -** Redistributions in binary form must reproduce the Contributor's
> - copyright notice, this list of conditions and the following
> - disclaimer in the documentation and/or other materials provided
> - with the distribution.
> -* Disclaimer. None of the names of Contributor, Intel, or the names
> - of their respective contributors may be used to endorse or
> - promote products derived from this software without specific
> - prior written permission.
> -* Contributor grants a license (with the right to sublicense) under
> - claims of Contributor's patents that Contributor can license that
> - are infringed by the Contribution (as delivered by Contributor) to
> - make, use, distribute, sell, offer for sale, and import the
> - Contribution and derivative works thereof solely to the minimum
> - extent necessary for licensee to exercise the granted copyright
> - license; this patent license applies solely to those portions of
> - the Contribution that are unmodified. No hardware per se is
> - licensed.
> -* EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
> - CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "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
> - CONTRIBUTOR 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 THE
> - CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> - DAMAGE.
> -
> -== SECTION 3: Representations ==
> -* You represent that You are legally entitled to grant the above
> - license. If your employer(s) has rights to intellectual property
> - that You create that includes Your Contributions, You represent
> - that You have received permission to make Contributions on behalf
> - of that employer, that Your employer has waived such rights for
> - Your Contributions.
> -* You represent that each of Your Contributions is Your original
> - creation (see Section 4 for submissions on behalf of others).
> - You represent that Your Contribution submissions include complete
> - details of any third-party license or other restriction
> - (including, but not limited to, related patents and trademarks)
> - of which You are personally aware and which are associated with
> - any part of Your Contributions.
> -
> -== SECTION 4: Third Party Contributions ==
> -* Should You wish to submit work that is not Your original creation,
> - You may submit it to TianoCore site separately from any
> - Contribution, identifying the complete details of its source
> - and of any license or other restriction (including, but not
> - limited to, related patents, trademarks, and license agreements)
> - of which You are personally aware, and conspicuously marking the
> - work as "Submitted on behalf of a third-party: [named here]".
> -
> -== SECTION 5: Miscellaneous ==
> -* Applicable Laws. Any claims arising under or relating to this
> - Agreement shall be governed by the internal substantive laws of
> - the State of Delaware or federal courts located in Delaware,
> - without regard to principles of conflict of laws.
> -* Language. This Agreement is in the English language only, which
> - language shall be controlling in all respects, and all versions
> - of this Agreement in any other language shall be for accommodation
> - only and shall not be binding. All communications and notices made
> - or given pursuant to this Agreement, and all documentation and
> - support to be provided, unless otherwise noted, shall be in the
> - English language.
> -
> diff --git a/Silicon/Intel/KabylakeSiliconBinPkg/License.txt b/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> index 3274186..5f9dd7a 100644
> --- a/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> +++ b/Silicon/Intel/KabylakeSiliconBinPkg/License.txt
> @@ -1,4 +1,4 @@
> -Copyright (c) 2012, Intel Corporation. All rights reserved.
> +Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.
>
> Redistribution and use in source and binary forms, with or without
> modification, are permitted provided that the following conditions
> @@ -25,6 +25,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> POSSIBILITY OF SUCH DAMAGE.
>
> Some files are subject to a license documented in the
> -IntelProprietaryLicense.txt file. These files are in the same
> -directory as IntelProprietaryLicense.txt, and they do not have
> +IntelMicrocodeLicense.txt file. These files are in the same
> +directory as IntelMicrocodeLicense.txt, and they do not have
> a license specified within the file.
> diff --git a/Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMicrocodeLicense.txt b/Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMicrocodeLicense.txt
> new file mode 100644
> index 0000000..707d090
> --- /dev/null
> +++ b/Silicon/Intel/KabylakeSiliconBinPkg/Microcode/IntelMicrocodeLicense.txt
> @@ -0,0 +1,37 @@
> +Copyright (c) 2018-2019 Intel Corporation.
> +All rights reserved.
> +
> +Redistribution.
> +
> +Redistribution and use in binary form, without modification, are permitted,
> +provided that the following conditions are met:
> +
> +1. Redistributions must reproduce the above copyright notice and the
> + following disclaimer in the documentation and/or other materials provided
> + with the distribution.
> +
> +2. Neither the name of Intel Corporation nor the names of its suppliers may
> + be used to endorse or promote products derived from this software without
> + specific prior written permission.
> +
> +3. No reverse engineering, decompilation, or disassembly of this software
> + is permitted.
> +
> +
> +"Binary form" includes any format that is commonly used for electronic
> +conveyance that is a reversible, bit-exact translation of binary
> +representation to ASCII or ISO text, for example "uuencode".
> +
> +DISCLAIMER.
> +
> +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.
> --
> 2.17.1.windows.2
>
next prev parent reply other threads:[~2019-07-26 17:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 17:35 [edk2-non-osi] [PATCH 0/6] Merge content from devel-MinPlatform to master Nate DeSimone
2019-07-25 17:35 ` [edk2-non-osi] [PATCH 1/6] Add KabylakeSiliconBinPkg Nate DeSimone
2019-07-26 0:48 ` Chiu, Chasel
2019-07-25 17:35 ` [edk2-non-osi] [PATCH 2/6] Add new Microcode Nate DeSimone
2019-07-25 17:35 ` [edk2-non-osi] [PATCH 3/6] PurleySiliconBinPkg: Initial version Nate DeSimone
2019-07-25 17:35 ` [edk2-non-osi] [PATCH 4/6] replace FSP license file Nate DeSimone
2019-07-29 14:46 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-07-29 17:50 ` Michael D Kinney
2019-07-25 17:35 ` [edk2-non-osi] [PATCH 5/6] Added TXT ACMs of release 1.7.1 PW Nate DeSimone
2019-07-25 17:35 ` [edk2-non-osi] [PATCH 6/6] Cleanup maintainers, contributions, and licenses Nate DeSimone
2019-07-25 19:51 ` Laszlo Ersek
2019-07-26 0:52 ` Chiu, Chasel
2019-07-26 17:32 ` Leif Lindholm [this message]
2019-07-29 20:18 ` [edk2-devel] " Michael D Kinney
2019-07-30 21:34 ` Nate DeSimone
2019-08-01 19:57 ` Michael D Kinney
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-list 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=20190726173210.GD22656@bivouac.eciton.net \
--to=devel@edk2.groups.io \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox