[PATCH stable-5.15] MAINTAINERS: update Krzysztof Kozlowski's email

[PATCH stable-5.15] MAINTAINERS: update Krzysztof Kozlowski's email

[Krzysztof Kozlowski]

From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

commit 5125091d757a251a128ec38d2397c9d160394eac upstream.

Use Krzysztof Kozlowski's @kernel.org account in maintainer entries.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20220307172805.156760-1-krzysztof.kozlowski@canonical.com'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 .mailmap    |  1 +
 MAINTAINERS | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.mailmap b/.mailmap
index 90e614d2bf7e..243fb1c728b3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -196,6 +196,7 @@ Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
 Koushik <raghavendra.koushik@neterion.com>
 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
+Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
 Leonid I Ananiev <leonid.i.ananiev@intel.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index c8103e57a70b..10ad85379afa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2494,7 +2494,7 @@ F:	sound/soc/rockchip/
 N:	rockchip
 
 ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:	linux-samsung-soc@vger.kernel.org
 S:	Maintained
@@ -11406,7 +11406,7 @@ F:	drivers/regulator/max77802-regulator.c
 F:	include/dt-bindings/*/*max77802.h
 
 MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:	linux-pm@vger.kernel.org
 S:	Supported
@@ -11415,7 +11415,7 @@ F:	drivers/power/supply/max77693_charger.c
 
 MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
 M:	Chanwoo Choi <cw00.choi@samsung.com>
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:	linux-kernel@vger.kernel.org
 S:	Supported
@@ -12087,7 +12087,7 @@ F:	include/linux/memblock.h
 F:	mm/memblock.c
 
 MEMORY CONTROLLER DRIVERS
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@ -13206,7 +13206,7 @@ F:	include/uapi/linux/nexthop.h
 F:	net/ipv4/nexthop.c
 
 NFC SUBSYSTEM
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 L:	linux-nfc@lists.01.org (subscribers-only)
 L:	netdev@vger.kernel.org
 S:	Maintained
@@ -13489,7 +13489,7 @@ F:	Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
 F:	drivers/regulator/pf8x00-regulator.c
 
 NXP PTN5150A CC LOGIC AND EXTCON DRIVER
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@ -14851,7 +14851,7 @@ F:	drivers/pinctrl/renesas/
 
 PIN CONTROLLER - SAMSUNG
 M:	Tomasz Figa <tomasz.figa@gmail.com>
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:	linux-samsung-soc@vger.kernel.org
@@ -16427,7 +16427,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 F:	drivers/s390/scsi/zfcp_*
 
 S3C ADC BATTERY DRIVER
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 L:	linux-samsung-soc@vger.kernel.org
 S:	Odd Fixes
 F:	drivers/power/supply/s3c_adc_battery.c
@@ -16472,7 +16472,7 @@ F:	Documentation/admin-guide/LSM/SafeSetID.rst
 F:	security/safesetid/
 
 SAMSUNG AUDIO (ASoC) DRIVERS
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:	Supported
@@ -16480,7 +16480,7 @@ F:	Documentation/devicetree/bindings/sound/samsung*
 F:	sound/soc/samsung/
 
 SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 L:	linux-crypto@vger.kernel.org
 L:	linux-samsung-soc@vger.kernel.org
 S:	Maintained
@@ -16515,7 +16515,7 @@ S:	Maintained
 F:	drivers/platform/x86/samsung-laptop.c
 
 SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:	linux-kernel@vger.kernel.org
 L:	linux-samsung-soc@vger.kernel.org
@@ -16540,7 +16540,7 @@ F:	drivers/media/platform/s3c-camif/
 F:	include/media/drv-intf/s3c_camif.h
 
 SAMSUNG S3FWRN5 NFC DRIVER
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Krzysztof Opasiak <k.opasiak@samsung.com>
 L:	linux-nfc@lists.01.org (subscribers-only)
 S:	Maintained
@@ -16560,7 +16560,7 @@ S:	Supported
 F:	drivers/media/i2c/s5k5baf.c
 
 SAMSUNG S5P Security SubSystem (SSS) DRIVER
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Vladimir Zapolskiy <vz@mleia.com>
 L:	linux-crypto@vger.kernel.org
 L:	linux-samsung-soc@vger.kernel.org
@@ -16596,7 +16596,7 @@ F:	include/linux/clk/samsung.h
 F:	include/linux/platform_data/clk-s3c2410.h
 
 SAMSUNG SPI DRIVERS
-M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+M:	Krzysztof Kozlowski <krzk@kernel.org>
 M:	Andi Shyti <andi@etezian.org>
 L:	linux-spi@vger.kernel.org
 L:	linux-samsung-soc@vger.kernel.org
-- 
2.32.0

Re: [PATCH stable-5.15] MAINTAINERS: update Krzysztof Kozlowski's email

[Greg KH]

On Mon, Mar 21, 2022 at 03:47:43PM +0100, Krzysztof Kozlowski wrote:
> From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> 
> commit 5125091d757a251a128ec38d2397c9d160394eac upstream.
> 
> Use Krzysztof Kozlowski's @kernel.org account in maintainer entries.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> Link: https://lore.kernel.org/r/20220307172805.156760-1-krzysztof.kozlowski@canonical.com'
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  .mailmap    |  1 +
>  MAINTAINERS | 28 ++++++++++++++--------------
>  2 files changed, 15 insertions(+), 14 deletions(-)

We do not normally do MAINTAINERS updates for older kernel trees as no
one should be doing development against them.

Any reason why this is different?

thanks,

greg k-h

Re: [PATCH stable-5.15] MAINTAINERS: update Krzysztof Kozlowski's email

[Krzysztof Kozlowski]

On 21/03/2022 16:55, Greg KH wrote:
> On Mon, Mar 21, 2022 at 03:47:43PM +0100, Krzysztof Kozlowski wrote:
>> From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>>
>> commit 5125091d757a251a128ec38d2397c9d160394eac upstream.
>>
>> Use Krzysztof Kozlowski's @kernel.org account in maintainer entries.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>> Link: https://lore.kernel.org/r/20220307172805.156760-1-krzysztof.kozlowski@canonical.com'
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>  .mailmap    |  1 +
>>  MAINTAINERS | 28 ++++++++++++++--------------
>>  2 files changed, 15 insertions(+), 14 deletions(-)
> 
> We do not normally do MAINTAINERS updates for older kernel trees as no
> one should be doing development against them.
> 
> Any reason why this is different?
> 

Hi Greg,

No, it's not different, but people work on backports for stables on a
stable branch. Then they send such patch from within the stable tree,
because it's easier, I guess. Without the .mailmap all these backports
will go to wrong email address - my @canonical.com will start bouncing
in two days.

In the same time I am not sure which mailmap is being followed by your
and other stable-folks tools, when notifying with backport queue
("5.16.17-rc1 review" etc.).

Plus people actually might have some questions about some my backported
commit. They might respond to the email shown in git log, which will be
wrong without mailmap file.

Best regards,
Krzysztof

Re: [PATCH stable-5.15] MAINTAINERS: update Krzysztof Kozlowski's email

[Greg KH]

On Tue, Mar 22, 2022 at 11:19:50AM +0100, Krzysztof Kozlowski wrote:
> On 21/03/2022 16:55, Greg KH wrote:
> > On Mon, Mar 21, 2022 at 03:47:43PM +0100, Krzysztof Kozlowski wrote:
> >> From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> >>
> >> commit 5125091d757a251a128ec38d2397c9d160394eac upstream.
> >>
> >> Use Krzysztof Kozlowski's @kernel.org account in maintainer entries.
> >>
> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> >> Link: https://lore.kernel.org/r/20220307172805.156760-1-krzysztof.kozlowski@canonical.com'
> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >> ---
> >>  .mailmap    |  1 +
> >>  MAINTAINERS | 28 ++++++++++++++--------------
> >>  2 files changed, 15 insertions(+), 14 deletions(-)
> > 
> > We do not normally do MAINTAINERS updates for older kernel trees as no
> > one should be doing development against them.
> > 
> > Any reason why this is different?
> > 
> 
> Hi Greg,
> 
> No, it's not different, but people work on backports for stables on a
> stable branch. Then they send such patch from within the stable tree,
> because it's easier, I guess. Without the .mailmap all these backports
> will go to wrong email address - my @canonical.com will start bouncing
> in two days.
> 
> In the same time I am not sure which mailmap is being followed by your
> and other stable-folks tools, when notifying with backport queue
> ("5.16.17-rc1 review" etc.).

I don't use any tools that uses the mailmap file at all.  So updating it
isn't going to affect the stable patch review process, sorry.

> Plus people actually might have some questions about some my backported
> commit. They might respond to the email shown in git log, which will be
> wrong without mailmap file.

People change email addresses all the time, this isn't anything new.  I
really don't want to get into the habit of having to keep this file up
to date with Linus's tree for 6 years, sorry.

thanks,

greg k-h

Re: [PATCH stable-5.15] MAINTAINERS: update Krzysztof Kozlowski's email

[Krzysztof Kozlowski]

On 22/03/2022 11:27, Greg KH wrote:
>> Hi Greg,
>>
>> No, it's not different, but people work on backports for stables on a
>> stable branch. Then they send such patch from within the stable tree,
>> because it's easier, I guess. Without the .mailmap all these backports
>> will go to wrong email address - my @canonical.com will start bouncing
>> in two days.
>>
>> In the same time I am not sure which mailmap is being followed by your
>> and other stable-folks tools, when notifying with backport queue
>> ("5.16.17-rc1 review" etc.).
> 
> I don't use any tools that uses the mailmap file at all.  So updating it
> isn't going to affect the stable patch review process, sorry.
> 
>> Plus people actually might have some questions about some my backported
>> commit. They might respond to the email shown in git log, which will be
>> wrong without mailmap file.
> 
> People change email addresses all the time, this isn't anything new.  I
> really don't want to get into the habit of having to keep this file up
> to date with Linus's tree for 6 years, sorry.
> 

Understood, no problem, thanks for the explanation!


Best regards,
Krzysztof