diff options
| author | Dan Handley <dan.handley@arm.com> | 2016-09-20 17:14:25 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2016-09-27 21:52:03 +0100 |
| commit | 110740d3265727b53a165a1e2e5fff3219928d1d (patch) | |
| tree | caf82a5e88a1b6cf93ec839b089033dd7afce3a2 /contributing.md | |
| parent | bfd925139fdbc2e87979849907b34843aa326994 (diff) | |
Drop requirement for CLA in contribution.md
It is no longer necessary for contributors to send a CLA to ARM
before making contributions. Contributors must instead add a
"Signed-off-by:" line to each commit, which certifies that the
contribution is made under the Developer Certificate of Origin
(DCO).
Update contributing.md to reflect this new policy and add a copy of
the DCO to the repository.
Change-Id: I7ca98bffc3bf57e8bdd51d763c24f13e415a328b
Signed-off-by: Dan Handley <dan.handley@arm.com>
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/contributing.md b/contributing.md index 6bf3900d..9a253ca7 100644 --- a/contributing.md +++ b/contributing.md @@ -1,26 +1,6 @@ Contributing to ARM Trusted Firmware ==================================== -Before you start contributing to this project you must sign the ARM -Contributor License Agreement (CLA). - -Individuals who want to contribute their own work must sign and return an -Individual CLA. Companies that want to contribute must sign and return a -Corporate CLA if their employees' intellectual property has been assigned to -the employer. Copies of the CLAs are available from the [contributing page] of -the ARM website. Please wait for ARM to confirm acceptance of your CLA before -making contributions. - -For this project, ARM also requires the GitHub account name(s) associated with -each individual contributor or the designated employees of corporate -contributors. Only contributions originating from these accounts will be -considered covered by the CLA. To avoid delay, you should provide the Github -account name(s) at the same time as the signed CLA. - -ARM reserves the right to not accept a contribution. This may be for technical, -commercial or legal reasons. - - Getting Started --------------- @@ -77,7 +57,12 @@ Making Changes Submitting Changes ------------------ -* Ensure ARM has your signed CLA and has confirmed acceptance of it. +* Ensure that each commit in the series has at least one `Signed-off-by:` + line, using your real name and email address. The names in the + `Signed-off-by:` and `Author:` lines must match. If anyone else contributes + to the commit, they must also add their own `Signed-off-by:` line. + By adding this line the contributor certifies the contribution is made under + the terms of the [Developer Certificate of Origin (DCO)][DCO]. * Push your local changes to your fork of the repository. * Submit a [pull request] to the [arm-trusted-firmware] `integration` branch. * The changes in the [pull request] will then undergo further review and @@ -101,7 +86,7 @@ Submitting Changes - - - - - - - - - - - - - - - - - - - - - - - - - - -_Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved._ +_Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved._ [User Guide]: ./docs/user-guide.md @@ -109,8 +94,8 @@ _Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved._ [Porting Guide]: ./docs/porting-guide.md [Firmware Design]: ./docs/firmware-design.md [Acknowledgements]: ./acknowledgements.md "Contributor acknowledgements" +[DCO]: ./dco.txt -[contributing page]: http://www.arm.com/community/open-source-contributing.php [GitHub account]: https://github.com/signup/free [Fork]: https://help.github.com/articles/fork-a-repo [issue tracking repository]: https://github.com/ARM-software/tf-issues |