[PATCH 1/7] Code of conduct: Fix wording around maintainers enforcing the code of conduct

From: Greg Kroah-Hartman
Date: Sat Oct 20 2018 - 09:52:00 EST

From: Chris Mason <clm@xxxxxx>

As it was originally worded, this paragraph requires maintainers to
enforce the code of conduct, or face potential repercussions. It sends
the wrong message, when really we just want maintainers to be part of
the solution and not violate the code of conduct themselves.

Removing it doesn't limit our ability to enforce the code of conduct,
and we can still encourage maintainers to help maintain high standards
for the level of discourse in their subsystem.

Signed-off-by: Chris Mason <clm@xxxxxx>
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
Acked-by: Amir Goldstein <amir73il@xxxxxxxxx>
Acked-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxx>
Acked-by: Borislav Petkov <bp@xxxxxxxxxx>
Acked-by: Christian LÃtke-Stetzkamp <christian@xxxxxxxx>
Acked-by: Christoph Hellwig <hch@xxxxxx>
Acked-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Acked-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Acked-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Acked-by: Dave Airlie <airlied@xxxxxxxxxx>
Acked-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Acked-by: David Ahern <dsa@xxxxxxxxxxxxxxxxxxx>
Acked-by: David Sterba <kdave@xxxxxxxxxx>
Acked-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Acked-by: Felipe Balbi <balbi@xxxxxxxxxx>
Acked-by: Felix Kuehling <Felix.Kuehling@xxxxxxx>
Acked-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
Acked-by: Florian Westphal <fw@xxxxxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Acked-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxx>
Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Acked-by: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx>
Acked-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Acked-by: Hans de Goede <j.w.r.degoede@xxxxxxxxx>
Acked-by: Harry Wentland <harry.wentland@xxxxxxx>
Acked-by: Heiko Stuebner <heiko@xxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxxxxx>
Acked-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
Acked-by: James Smart <james.smart@xxxxxxxxxxxx>
Acked-by: James Smart <jsmart2021@xxxxxxxxx>
Acked-by: Jan Kara <jack@xxxxxx>
Acked-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Acked-by: Jens Axboe <axboe@xxxxxxxxx>
Acked-by: Jessica Yu <jeyu@xxxxxxxxxx>
Acked-by: Jia-Ju Bai <baijiaju1990@xxxxxxxxx>
Acked-by: Jiri Kosina <jikos@xxxxxxxxxx>
Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Acked-by: Joerg Roedel <joro@xxxxxxxxxx>
Acked-by: Johan Hovold <johan@xxxxxxxxxx>
Acked-by: Johannes Thumshirn <jth@xxxxxxxxxx>
Acked-by: Jonathan Corbet <corbet@xxxxxxx>
Acked-by: Julia Lawall <julia.lawall@xxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Acked-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Acked-by: Lina Iyer <ilina@xxxxxxxxxxxxxx>
Acked-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxx>
Acked-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Acked-by: Matias BjÃrling <mb@xxxxxxxxxxx>
Acked-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxx>
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Acked-by: Mimi Zohar <zohar@xxxxxxxxxxxxx>
Acked-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
Acked-by: Nikolay Borisov <n.borisov.lkml@xxxxxxxxx>
Acked-by: Oded Gabbay <oded.gabbay@xxxxxxxxx>
Acked-by: Olof Johansson <olof@xxxxxxxxx>
Acked-by: Palmer Dabbelt <palmer@xxxxxxxxxxx>
Acked-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxx>
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>
Acked-by: Richard Weinberger <richard@xxxxxx>
Acked-by: Rik van Riel <riel@xxxxxxxxxxx>
Acked-by: Rob Clark <robdclark@xxxxxxxxx>
Acked-by: Rob Herring <robh@xxxxxxxxxx>
Acked-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Acked-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Acked-by: Sebastian Reichel <sre@xxxxxxxxxx>
Acked-by: Sergio Paracuellos <sergio.paracuellos@xxxxxxxxx>
Acked-by: Shawn Guo <shawnguo@xxxxxxxxxx>
Acked-by: Shuah Khan <shuah@xxxxxxxxxx>
Acked-by: Simon Horman <horms@xxxxxxxxxxxx>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Acked-by: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx>
Acked-by: Takashi Iwai <tiwai@xxxxxxxxxx>
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Theodore Ts'o <tytso@xxxxxxx>
Acked-by: Thierry Reding <thierry.reding@xxxxxxxxx>
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Tim Bird <tim.bird@xxxxxxxx>
Acked-by: Todd Poynor <toddpoynor@xxxxxxxxxx>
Acked-by: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
Acked-by: YueHaibing <yuehaibing@xxxxxxxxxx>
Reviewed-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Reviewed-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Documentation/process/code-of-conduct.rst | 4 ----
1 file changed, 4 deletions(-)

diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst
index ab7c24b5478c..a2641c19cf26 100644
--- a/Documentation/process/code-of-conduct.rst
+++ b/Documentation/process/code-of-conduct.rst
@@ -70,10 +70,6 @@ appropriate to the circumstances. The TAB is obligated to maintain
confidentiality with regard to the reporter of an incident. Further details of
specific enforcement policies may be posted separately.

-Maintainers who do not follow or enforce the Code of Conduct in good faith may
-face temporary or permanent repercussions as determined by other members of the
-projectâs leadership.