mirror of
https://github.com/torvalds/linux.git
synced 2026-09-25 21:21:09 -04:00
Greg Kroah-Hartman
ddbd2b7ad9
This file provides a basic guide for how to handle conflict resolution when it comes up in the development process. Acked-by: Alex Deucher <[email protected]> Acked-by: Arjan van de Ven <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Benjamin Herrenschmidt <[email protected]> Acked-by: Chris Ball <[email protected]> Acked-by: Chris Mason <[email protected]> Acked-by: Chris Metcalf <[email protected]> Acked-by: Dan Carpenter <[email protected]> Acked-by: Daniel Vetter <[email protected]> Acked-by: Dave Airlie <[email protected]> Acked-by: David Herrmann <[email protected]> Acked-by: Fabio Estevam <[email protected]> Acked-by: Felipe Balbi <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Acked-by: Gerd Hoffmann <[email protected]> Acked-by: Grant Likely <[email protected]> Acked-by: Guenter Roeck <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-by: Hannes Reinecke <[email protected]> Acked-by: Hans Verkuil <[email protected]> Acked-by: Hans de Goede <[email protected]> Acked-by: Hugh Dickins <[email protected]> Acked-by: Ingo Molnar <[email protected]> Acked-by: Jaegeuk Kim <[email protected]> Acked-by: James Bottomley <[email protected]> Acked-by: Jens Axboe <[email protected]> Acked-by: Jes Sorensen <[email protected]> Acked-by: Johan Hedberg <[email protected]> Acked-by: Johan Hovold <[email protected]> Acked-by: Johannes Berg <[email protected]> Acked-by: John W. Linville <[email protected]> Acked-by: Jonathan Corbet <[email protected]> Acked-by: Josh Triplett <[email protected]> Acked-by: Julia Lawall <[email protected]> Acked-by: Kees Cook <[email protected]> Acked-by: Kevin Hilman <[email protected]> Acked-by: Konrad Rzeszutek Wilk <[email protected]> Acked-by: Kristen Carlson Accardi <[email protected]> Acked-by: Kyungmin Park <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Luis R. Rodriguez <[email protected]> Acked-by: Magnus Damm <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Maxime Ripard <[email protected]> Acked-by: Mimi Zohar <[email protected]> Acked-by: NeilBrown <[email protected]> Acked-by: Olof Johansson <[email protected]> Acked-by: Paul E. McKenney <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Acked-by: Rik van Riel <[email protected]> Acked-by: Sachin Prabhu <[email protected]> Acked-by: Shuah Khan <[email protected]> Acked-by: Simon Horman <[email protected]> Acked-by: Stephen Rothwell <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Steven Rostedt <[email protected]> Acked-by: Takashi Iwai <[email protected]> Acked-by: Tejun Heo <[email protected]> Acked-by: Theodore Ts'o <[email protected]> Acked-by: Tony Luck <[email protected]> Acked-by: Will Deacon <[email protected]> Acked-by: Willy Tarreau <[email protected]> Acked-by: Zefan Li <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
28 lines
1.4 KiB
Plaintext
28 lines
1.4 KiB
Plaintext
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
|
|
<[email protected]>, 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."
|