2021-09-03 17:40:50

by Alyssa Rosenzweig

[permalink] [raw]
Subject: [PATCH] docs: kernel-hacking: Remove inappropriate text

Remove inappropriate sexual (and ableist) text from the locking
documentation, aligning it with the kernel code-of-conduct. As the text
was unrelated to locking, this change streamlines the document and
improves readability.

Signed-off-by: Alyssa Rosenzweig <[email protected]>
---
Documentation/kernel-hacking/locking.rst | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Documentation/kernel-hacking/locking.rst b/Documentation/kernel-hacking/locking.rst
index ed1284c6f078..3e1f71608f11 100644
--- a/Documentation/kernel-hacking/locking.rst
+++ b/Documentation/kernel-hacking/locking.rst
@@ -94,16 +94,10 @@ primitives, but I'll pretend they don't exist.
Locking in the Linux Kernel
===========================

-If I could give you one piece of advice: never sleep with anyone crazier
-than yourself. But if I had to give you advice on locking: **keep it
-simple**.
+If I could give you one piece of advice on locking: **keep it simple**.

Be reluctant to introduce new locks.

-Strangely enough, this last one is the exact reverse of my advice when
-you **have** slept with someone crazier than yourself. And you should
-think about getting a big dog.
-
Two Main Types of Kernel Locks: Spinlocks and Mutexes
-----------------------------------------------------

--
2.30.2


2021-09-03 22:00:01

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [PATCH] docs: kernel-hacking: Remove inappropriate text

Alyssa Rosenzweig <[email protected]> writes:

> Remove inappropriate sexual (and ableist) text from the locking
> documentation, aligning it with the kernel code-of-conduct. As the text
> was unrelated to locking, this change streamlines the document and
> improves readability.
>
> Signed-off-by: Alyssa Rosenzweig <[email protected]>
> ---
> Documentation/kernel-hacking/locking.rst | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)

That text dates all the way back to pre-2.4 kernels...there goes a bit
of history. It's history that we can do without at this point, though;
patch applied, thanks.

jon