From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3E77A21E49BB8 for ; Tue, 22 Aug 2017 16:30:48 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 22 Aug 2017 16:33:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,414,1498546800"; d="scan'208";a="893153613" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by FMSMGA003.fm.intel.com with ESMTP; 22 Aug 2017 16:33:03 -0700 Received: from orsmsx158.amr.corp.intel.com (10.22.240.20) by ORSMSX108.amr.corp.intel.com (10.22.240.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 22 Aug 2017 16:33:03 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.211]) by ORSMSX158.amr.corp.intel.com ([169.254.10.102]) with mapi id 14.03.0319.002; Tue, 22 Aug 2017 16:33:02 -0700 From: "Kinney, Michael D" To: Leif Lindholm , "edk2-devel@lists.01.org" , "Kinney, Michael D" Thread-Topic: [PATCH edk2-platforms] Contributions.txt: update to latest version from EDK2 Thread-Index: AQHTGon8JCYgBp5Pj0qxohv/ZqVfUKKRCOAw Date: Tue, 22 Aug 2017 23:33:02 +0000 Message-ID: References: <20170821143002.17076-1-leif.lindholm@linaro.org> In-Reply-To: <20170821143002.17076-1-leif.lindholm@linaro.org> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [PATCH edk2-platforms] Contributions.txt: update to latest version from EDK2 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Aug 2017 23:30:48 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael D Kinney Mike > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > Sent: Monday, August 21, 2017 7:30 AM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D > Subject: [PATCH edk2-platforms] Contributions.txt: update to > latest version from EDK2 >=20 > Update to require TianoCore Contribution Agreement 1.1, > taken from commmit > fc9f971e9745 ("edk2: Fix typo in Contributions.txt") >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Leif Lindholm > --- > Contributions.txt | 93 > +++++++++++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 77 insertions(+), 16 deletions(-) >=20 > diff --git a/Contributions.txt b/Contributions.txt > index b6c15df2d..f34626912 100644 > --- a/Contributions.txt > +++ b/Contributions.txt > @@ -11,7 +11,7 @@ To make a contribution to a TianoCore project, > follow these steps. > 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 > + For example: Contributed-under: TianoCore Contribution > Agreement 1.1 > The "TianoCore Contribution Agreement" is included below in > this document. > 4. Submit your code to the TianoCore project using the process > @@ -26,7 +26,10 @@ To make a contribution to a TianoCore > project, follow these steps. > * MIT: http://opensource.org/licenses/MIT > * Python-2.0: http://opensource.org/licenses/Python-2.0 > * Zlib: http://opensource.org/licenses/Zlib > - For documentation: > https://www.freebsd.org/copyright/freebsd-doc-license.html > + > + For documentation: > + * FreeBSD Documentation License > + https://www.freebsd.org/copyright/freebsd-doc-license.html >=20 > Contributions of code put into the public domain can also be > accepted. > @@ -34,37 +37,94 @@ To make a contribution to a TianoCore > project, follow these steps. > Contributions using other licenses might be accepted, but > further > review will be required. >=20 > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > +=3D Change Description / Commit Message / Patch Email =3D > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > + > +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. > + > +=3D=3D Sample Change Description / Commit Message =3D > + > +=3D=3D=3D Start of sample patch email message =3D=3D=3D > + > +From: Contributor Name > +Subject: [Repository/Branch PATCH] Module: Brief-single-line- > summary > + > +Full-commit-message > + > +Contributed-under: TianoCore Contribution Agreement 1.1 > +Signed-off-by: Contributor Name > +--- > + > +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 > + > +=3D=3D=3D End of sample patch email message =3D=3D=3D > + > +=3D=3D=3D Notes for sample patch email =3D=3D=3D > + > +* The first line of commit message is taken from the email's > subject > + line following [Repository/Branch 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 > + > +=3D=3D=3D Definitions for sample patch email =3D=3D=3D > + > +* "Repository" is the identifier of the repository the patch > applies. > + This identifier should only be provided for repositories > other than > + 'edk2'. For example 'edk2-BuildSpecification' or 'staging'. > +* "Branch" is the identifier of the branch the patch applies. > This > + identifier should only be provided for branches other than > 'edk2/master'. > + For example 'edk2/UDK2015', 'edk2- > BuildSpecification/release/1.27', or > + 'staging/edk2-test'. > +* "Module" is a short identifier for the affected code or > documentation. For > + example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', > or > + 'EDK II INF File Format'. > +* "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" explicitly states that the contribution > is > + made under the terms of the contribution 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. > + > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D TianoCore Contribution Agreement 1.1 =3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > -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 > +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. >=20 > -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 > +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. >=20 > 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 > +FreeBSD Documentation License ("FreeBSD"). A copy of the > license is > available at https://www.freebsd.org/copyright/freebsd-doc- > license.html or, > when applicable, in the associated License.txt file. >=20 > Certain other content may be made available under other > licenses as > -indicated in or with such Content(for example, in a License.txt > file). > +indicated in or with such Content (for example, in a > License.txt file). >=20 > You accept and agree to the following terms and conditions for > Your > present and future Contributions submitted to TianoCore site. > Except > @@ -172,3 +232,4 @@ title, and interest in and to Your > Contributions. > or given pursuant to this Agreement, and all documentation > and > support to be provided, unless otherwise noted, shall be in > the > English language. > + > -- > 2.11.0