

new file mode 100644

index 0000000000000..1684d0b4efa65

--- /dev/null

+++ b/ diff --git a/Documentation/CodeOfConflict b/Documentation/CodeOfConflictnew file mode 100644index 0000000000000..1684d0b4efa65--- /dev/null+++ b/ Documentation/CodeOfConflict

@@ -0,0 +1,27 @@

+Code of Conflict

+----------------

+

+The Linux kernel development effort is a very personal process compared

+to "traditional" ways of developing software. Your code and ideas

+behind it will be carefully reviewed, often resulting in critique and

+criticism. The review will almost always require improvements to the

+code before it can be included in the kernel. Know that this happens

+because everyone involved wants to see the best possible solution for

+the overall success of Linux. This development process has been proven

+to create the most robust operating system kernel ever, and we do not

+want to do anything to cause the quality of submission and eventual

+result to ever decrease.

+

+If however, anyone feels personally abused, threatened, or otherwise

+uncomfortable due to this process, that is not acceptable. If so,

+please contact the Linux Foundation's Technical Advisory Board at

+<tab@lists.linux-foundation.org>, or the individual members, and they

+will work to resolve the issue to the best of their ability. For more

+information on who is on the Technical Advisory Board and what their

+role is, please see:

+ http://www.linuxfoundation.org/programs/advisory-councils/tab

+

+As a reviewer of code, please strive to keep things civil and focused on

+the technical issues involved. We are all humans, and frustrations can

+be high on both sides of the process. Try to keep in mind the immortal

+words of Bill and Ted, "Be excellent to each other."