Nouveau - Nov 2018 - [PATCH RFC 03/15] drm/nouveau: replace **** with a hug

In order to comply with the CoC, replace **** with a hug.

Jarkko Sakkinen (15):
  MIPS: replace **** with a hug
  Documentation: replace **** with a hug
  drm/nouveau: replace **** with a hug
  m68k: replace **** with a hug
  parisc: replace **** with a hug
  cpufreq: replace **** with a hug
  ide: replace **** with a hug
  media: replace **** with a hug
  mtd: replace **** with a hug
  net/sunhme: replace **** with a hug
  scsi: replace **** with a hug
  inotify: replace **** with a hug
  irq: replace **** with a hug
  lib: replace **** with a hug
  net: replace **** with a hug

 Documentation/kernel-hacking/locking.rst      |  2 +-
 arch/m68k/include/asm/sun3ints.h              |  2 +-
 arch/mips/pci/ops-bridge.c                    | 24 +++++++++----------
 arch/mips/sgi-ip22/ip22-setup.c               |  2 +-
 arch/parisc/kernel/sys_parisc.c               |  2 +-
 drivers/cpufreq/powernow-k7.c                 |  2 +-
 .../gpu/drm/nouveau/nvkm/subdev/bios/init.c   |  2 +-
 .../nouveau/nvkm/subdev/pmu/fuc/macros.fuc    |  2 +-
 drivers/ide/cmd640.c                          |  2 +-
 drivers/media/i2c/bt819.c                     |  8 ++++---
 drivers/mtd/mtd_blkdevs.c                     |  2 +-
 drivers/net/ethernet/sun/sunhme.c             |  4 ++--
 drivers/scsi/qlogicpti.h                      |  2 +-
 fs/notify/inotify/inotify_user.c              |  2 +-
 kernel/irq/timings.c                          |  2 +-
 lib/vsprintf.c                                |  2 +-
 net/core/skbuff.c                             |  2 +-
 17 files changed, 33 insertions(+), 31 deletions(-)

-- 
2.19.1

In order to comply with the CoC, replace **** with a hug.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen at linux.intel.com>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c        | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
index 9cc10e438b3d..55a0060881ea 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
@@ -446,7 +446,7 @@ init_ram_restrict(struct nvbios_init *init)
 {
 	/* This appears to be the behaviour of the VBIOS parser, and *is*
 	 * important to cache the NV_PEXTDEV_BOOT0 on later chipsets to
-	 * avoid fucking up the memory controller (somehow) by reading it
+	 * avoid hugging up the memory controller (somehow) by reading it
 	 * on every INIT_RAM_RESTRICT_ZM_GROUP opcode.
 	 *
 	 * Preserving the non-caching behaviour on earlier chipsets just
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
index 3737bd27f74e..ee364c71cc2e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
@@ -46,7 +46,7 @@
 #define NV_PPWR_INTR_EN_SET_SUBINTR                                  0x00000800
 #define NV_PPWR_INTR_EN_SET_WATCHDOG                                 0x00000002
 #define NV_PPWR_INTR_EN_CLR                                              0x0014
-#define NV_PPWR_INTR_EN_CLR_MASK                    /* fuck i hate envyas */ -1
+#define NV_PPWR_INTR_EN_CLR_MASK                    /* hug i hate envyas */ -1
 #define NV_PPWR_INTR_ROUTE                                               0x001c
 #define NV_PPWR_TIMER_LOW                                                0x002c
 #define NV_PPWR_WATCHDOG_TIME                                            0x0034
-- 
2.19.1

On Fri, Nov 30, 2018 at 11:27 AM Jarkko Sakkinen
<jarkko.sakkinen at linux.intel.com> wrote:
>
> In order to comply with the CoC, replace **** with a hug.
Heh. I support the replacement of the stronger language, but I find
"hug", "hugged", and "hugging" to be very weird
replacements. Can we
bikeshed this to "heck", "hecked", and "hecking"
(or "heckin" to
follow true Doggo meme style).

"This API is hugged" doesn't make any sense to me. "This API
is
hecked" is better, or at least funnier (to me). "Hug this
interface"
similarly makes no sense, but "Heck this interface" seems better.
"Don't touch my hecking code", "What the heck were they
thinking?"
etc... "hug" is odd.

Better yet, since it's only 17 files, how about doing context-specific
changes? "This API is terrible", "Hateful interface",
"Don't touch my
freakin' code", "What in the world were they thinking?" etc?

-Kees
>
> Jarkko Sakkinen (15):
>   MIPS: replace **** with a hug
>   Documentation: replace **** with a hug
>   drm/nouveau: replace **** with a hug
>   m68k: replace **** with a hug
>   parisc: replace **** with a hug
>   cpufreq: replace **** with a hug
>   ide: replace **** with a hug
>   media: replace **** with a hug
>   mtd: replace **** with a hug
>   net/sunhme: replace **** with a hug
>   scsi: replace **** with a hug
>   inotify: replace **** with a hug
>   irq: replace **** with a hug
>   lib: replace **** with a hug
>   net: replace **** with a hug
>
>  Documentation/kernel-hacking/locking.rst      |  2 +-
>  arch/m68k/include/asm/sun3ints.h              |  2 +-
>  arch/mips/pci/ops-bridge.c                    | 24 +++++++++----------
>  arch/mips/sgi-ip22/ip22-setup.c               |  2 +-
>  arch/parisc/kernel/sys_parisc.c               |  2 +-
>  drivers/cpufreq/powernow-k7.c                 |  2 +-
>  .../gpu/drm/nouveau/nvkm/subdev/bios/init.c   |  2 +-
>  .../nouveau/nvkm/subdev/pmu/fuc/macros.fuc    |  2 +-
>  drivers/ide/cmd640.c                          |  2 +-
>  drivers/media/i2c/bt819.c                     |  8 ++++---
>  drivers/mtd/mtd_blkdevs.c                     |  2 +-
>  drivers/net/ethernet/sun/sunhme.c             |  4 ++--
>  drivers/scsi/qlogicpti.h                      |  2 +-
>  fs/notify/inotify/inotify_user.c              |  2 +-
>  kernel/irq/timings.c                          |  2 +-
>  lib/vsprintf.c                                |  2 +-
>  net/core/skbuff.c                             |  2 +-
>  17 files changed, 33 insertions(+), 31 deletions(-)
>
> --
> 2.19.1
>

-- 
Kees Cook

On Fri, 30 Nov 2018, Kees Cook wrote:
>On Fri, Nov 30, 2018 at 11:27 AM Jarkko Sakkinen
><jarkko.sakkinen at linux.intel.com> wrote:
>>
>> In order to comply with the CoC, replace **** with a hug.
I hope this is some kind of joke. How would anyone get offended by reading
technical comments? This is all beyond me...

Thanks,
Davidlohr

On 11/30/18 8:40 PM, Kees Cook wrote:
> Better yet, since it's only 17 files, how about doing context-specific
> changes? "This API is terrible", "Hateful interface",
"Don't touch my
> freakin' code", "What in the world were they thinking?"
etc?
Or just leave it as is because we're all grown up and don't freak out
when a piece of text contains the word "fuck".

I still don't understand why people think that the word "fuck" is
what
would keep certain groups from contributing to the Linux kernel. In all
seriousness, it doesn't.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

On Fri, Nov 30, 2018 at 5:30 PM Jarkko Sakkinen
<jarkko.sakkinen at linux.intel.com> wrote:
>
> In order to comply with the CoC, replace **** with a hug.
>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen at linux.intel.com>
> ---
>  drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c        | 2 +-
>  drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
> index 9cc10e438b3d..55a0060881ea 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
> @@ -446,7 +446,7 @@ init_ram_restrict(struct nvbios_init *init)
>  {
>         /* This appears to be the behaviour of the VBIOS parser, and *is*
>          * important to cache the NV_PEXTDEV_BOOT0 on later chipsets to
> -        * avoid fucking up the memory controller (somehow) by reading it
> +        * avoid hugging up the memory controller (somehow) by reading it
>          * on every INIT_RAM_RESTRICT_ZM_GROUP opcode.
>          *
>          * Preserving the non-caching behaviour on earlier chipsets just
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
> index 3737bd27f74e..ee364c71cc2e 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
> @@ -46,7 +46,7 @@
>  #define NV_PPWR_INTR_EN_SET_SUBINTR                                 
0x00000800
>  #define NV_PPWR_INTR_EN_SET_WATCHDOG                                
0x00000002
>  #define NV_PPWR_INTR_EN_CLR                                             
0x0014
> -#define NV_PPWR_INTR_EN_CLR_MASK                    /* fuck i hate envyas
*/ -1
> +#define NV_PPWR_INTR_EN_CLR_MASK                    /* hug i hate envyas
*/ -1
Can you also capitalize the "i" please?

Thanks,
Diego

On 30/11/2018 20:40, Kees Cook wrote:
> On Fri, Nov 30, 2018 at 11:27 AM Jarkko Sakkinen
> <jarkko.sakkinen at linux.intel.com> wrote:
>>
>> In order to comply with the CoC, replace **** with a hug.
> 
> Heh. I support the replacement of the stronger language, but I find
> "hug", "hugged", and "hugging" to be very
weird replacements. Can we
> bikeshed this to "heck", "hecked", and
"hecking" (or "heckin" to
> follow true Doggo meme style).
> 
> "This API is hugged" doesn't make any sense to me. "This
API is
> hecked" is better, or at least funnier (to me). "Hug this
interface"
> similarly makes no sense, but "Heck this interface" seems better.
> "Don't touch my hecking code", "What the heck were they
thinking?"
> etc... "hug" is odd.
> 
Like John I don't think that the word "fuck" is something we have
to ban from
the source code, but I don't care too much. Anyway, please don't change
it to
something like heck as it might be difficult for non-english speaker to
understand.

Regards,
Matthias
> Better yet, since it's only 17 files, how about doing context-specific
> changes? "This API is terrible", "Hateful interface",
"Don't touch my
> freakin' code", "What in the world were they thinking?"
etc?
> 
> -Kees
> 
>>
>> Jarkko Sakkinen (15):
>>   MIPS: replace **** with a hug
>>   Documentation: replace **** with a hug
>>   drm/nouveau: replace **** with a hug
>>   m68k: replace **** with a hug
>>   parisc: replace **** with a hug
>>   cpufreq: replace **** with a hug
>>   ide: replace **** with a hug
>>   media: replace **** with a hug
>>   mtd: replace **** with a hug
>>   net/sunhme: replace **** with a hug
>>   scsi: replace **** with a hug
>>   inotify: replace **** with a hug
>>   irq: replace **** with a hug
>>   lib: replace **** with a hug
>>   net: replace **** with a hug
>>
>>  Documentation/kernel-hacking/locking.rst      |  2 +-
>>  arch/m68k/include/asm/sun3ints.h              |  2 +-
>>  arch/mips/pci/ops-bridge.c                    | 24 +++++++++----------
>>  arch/mips/sgi-ip22/ip22-setup.c               |  2 +-
>>  arch/parisc/kernel/sys_parisc.c               |  2 +-
>>  drivers/cpufreq/powernow-k7.c                 |  2 +-
>>  .../gpu/drm/nouveau/nvkm/subdev/bios/init.c   |  2 +-
>>  .../nouveau/nvkm/subdev/pmu/fuc/macros.fuc    |  2 +-
>>  drivers/ide/cmd640.c                          |  2 +-
>>  drivers/media/i2c/bt819.c                     |  8 ++++---
>>  drivers/mtd/mtd_blkdevs.c                     |  2 +-
>>  drivers/net/ethernet/sun/sunhme.c             |  4 ++--
>>  drivers/scsi/qlogicpti.h                      |  2 +-
>>  fs/notify/inotify/inotify_user.c              |  2 +-
>>  kernel/irq/timings.c                          |  2 +-
>>  lib/vsprintf.c                                |  2 +-
>>  net/core/skbuff.c                             |  2 +-
>>  17 files changed, 33 insertions(+), 31 deletions(-)
>>
>> --
>> 2.19.1
>>
> 
>

On 30 Nov 2018, at 14:40, Kees Cook wrote:
> On Fri, Nov 30, 2018 at 11:27 AM Jarkko Sakkinen
> <jarkko.sakkinen at linux.intel.com> wrote:
>>
>> In order to comply with the CoC, replace **** with a hug.
>
> Heh. I support the replacement of the stronger language, but I find
> "hug", "hugged", and "hugging" to be very
weird replacements. Can we
> bikeshed this to "heck", "hecked", and
"hecking" (or "heckin" to
> follow true Doggo meme style).
>
> "This API is hugged" doesn't make any sense to me. "This
API is
> hecked" is better, or at least funnier (to me). "Hug this
interface"
> similarly makes no sense, but "Heck this interface" seems better.
> "Don't touch my hecking code", "What the heck were they
thinking?"
> etc... "hug" is odd.
>
> Better yet, since it's only 17 files, how about doing context-specific
> changes? "This API is terrible", "Hateful interface",
"Don't touch my
> freakin' code", "What in the world were they thinking?"
etc?
I think the bar for changing the documentation/comments should be 
improvement in the clarity or approachability of whatever is being 
changed.

This patch set is kind of like Linus sitting at kernel summit with a 
sign that says "Free Hugs".  Kind of confusing, and really unlikely to
make anyone involved happier about working on the kernel.

Jarkko, making things clearer and more approachable is absolutely worth 
the time if you're interested, but I think it'll mean larger and more 
individualized changes to these files.

-chris

On Fri, Nov 30, 2018 at 11:40:17AM -0800, Kees Cook
wrote:
> On Fri, Nov 30, 2018 at 11:27 AM Jarkko Sakkinen
> <jarkko.sakkinen at linux.intel.com> wrote:
> >
> > In order to comply with the CoC, replace **** with a hug.
> 
> Heh. I support the replacement of the stronger language, but I find
> "hug", "hugged", and "hugging" to be very
weird replacements. Can we
> bikeshed this to "heck", "hecked", and
"hecking" (or "heckin" to
> follow true Doggo meme style).
> 
> "This API is hugged" doesn't make any sense to me. "This
API is
> hecked" is better, or at least funnier (to me). "Hug this
interface"
> similarly makes no sense, but "Heck this interface" seems better.
> "Don't touch my hecking code", "What the heck were they
thinking?"
> etc... "hug" is odd.
> 
> Better yet, since it's only 17 files, how about doing context-specific
> changes? "This API is terrible", "Hateful interface",
"Don't touch my
> freakin' code", "What in the world were they thinking?"
etc?
I'm happy to refine this (thus the RFC tag)! And depending on the
culture, hugging could fall in the harrasment category. Actually, when I
think about it, in Finland this kind of poking of ones personal bubble
would be such :-)

I'll refine the patch set with more context sensitive replacements,
perhaps removing the comment altogether in some places. Thank you for
the feedback!

/Jarkko