From: Christian Brauner Date: Wed, 14 Feb 2018 12:04:48 +0000 (+0100) Subject: CONTRIBUTING: update X-Git-Tag: lxc-2.0.10~332 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32773a5d7c64fef3ff22ab450faf6ab78c9d9f6b;p=thirdparty%2Flxc.git CONTRIBUTING: update Signed-off-by: Christian Brauner --- diff --git a/CONTRIBUTING b/CONTRIBUTING index d3c343c11..16e2b7272 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -5,8 +5,7 @@ This project accepts contributions. In order to contribute, you should pay attention to a few things: 1 - your code must follow the coding style rules - 2 - the format of the submission must be email patches or github - pull requests + 2 - the format of the submission must Github pull requests 3 - your work must be signed @@ -20,25 +19,22 @@ the directory 'Documentation' of the Linux kernel source tree. It can be accessed online too: -http://lxr.linux.no/linux+v2.6.27/Documentation/CodingStyle +https://www.kernel.org/doc/html/v4.10/process/coding-style.html Submitting Modifications: ------------------------- -The contributions should be email patches or github pull requests. -The guidelines are the same as the patch submission for the Linux kernel -except for the DCO which is defined below. The guidelines are defined in the -'SubmittingPatches' file, available in the directory 'Documentation' -of the Linux kernel source tree. - -It can be accessed online too: - -https://www.kernel.org/doc/Documentation/SubmittingPatches - -You can submit your patches to the lxc-devel@lists.linuxcontainers.org mailing -list. Use http://lists.linuxcontainers.org/listinfo/lxc-devel to subscribe -to the list. - +The contributions must be Github pull requests. +It is also possible to send contributions as email patches. But please be aware +that the review process might take significantly longer than in the case of +Github pull requests. You can submit your email patches to the +lxc-devel@lists.linuxcontainers.org mailing list. (Use +http://lists.linuxcontainers.org/listinfo/lxc-devel to subscribe to the list.) +The guidelines for submitting email patches are the same as the patch submission +for the Linux kernel except for the DCO which is defined below. The guidelines +are defined in the 'SubmittingPatches' file, available in the directory +'Documentation' of the Linux kernel source tree: +https://www.kernel.org/doc/html/v4.10/process/submitting-patches.html Licensing for new files: ------------------------ @@ -56,13 +52,11 @@ Anything else (non-libaries) needs to be Free Software and needs to be allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers LGPLv2.1+ or GPLv2 for those. - When introducing a new file into the project, please make sure it has a copyright header making clear under which license it's being released and if it doesn't match the criteria described above, please explain your decision on the lxc-devel mailing-list when submitting your patch. - Developer Certificate of Origin: -------------------------------- @@ -111,3 +105,15 @@ You can do it by using option -s or --signoff when you commit git commit --signoff ... using your real name (sorry, no pseudonyms or anonymous contributions.) + +In addition we support the following DCOs which maintainers can use to indicate +that a patch is acceptable: + + Acked-by: Random J Developer + Reviewed-by: Random J Developer + +If you are contributing as a group who is implementing a feature together such +that it cannot be reasonably attributed to a single developer please use: + + Co-developed-by: Random J Developer 1 + Co-developed-by: Random J Developer 2