From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> commit 5125091d757a251a128ec38d2397c9d160394eac upstream. Use Krzysztof Kozlowski's @kernel.org account in maintainer entries. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20220307172805.156760-1-krzysztof.kozlowski@xxxxxxxxxxxxx' Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> --- .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@xxxxxxxxx> <k.khlebnikov@xxxxxxxxxxx> Koushik <raghavendra.koushik@xxxxxxxxxxxx> Krzysztof Kozlowski <krzk@xxxxxxxxxx> <k.kozlowski.k@xxxxxxxxx> Krzysztof Kozlowski <krzk@xxxxxxxxxx> <k.kozlowski@xxxxxxxxxxx> +Krzysztof Kozlowski <krzk@xxxxxxxxxx> <krzysztof.kozlowski@xxxxxxxxxxxxx> Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> Leonardo Bras <leobras.c@xxxxxxxxx> <leonardo@xxxxxxxxxxxxx> Leonid I Ananiev <leonid.i.ananiev@xxxxxxxxx> 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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) L: linux-samsung-soc@xxxxxxxxxxxxxxx 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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> L: linux-pm@xxxxxxxxxxxxxxx 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@xxxxxxxxxxx> -M: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> L: linux-kernel@xxxxxxxxxxxxxxx S: Supported @@ -12087,7 +12087,7 @@ F: include/linux/memblock.h F: mm/memblock.c MEMORY CONTROLLER DRIVERS -M: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-kernel@xxxxxxxxxxxxxxx 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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-nfc@xxxxxxxxxxxx (subscribers-only) L: netdev@xxxxxxxxxxxxxxx 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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-kernel@xxxxxxxxxxxxxxx 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@xxxxxxxxx> -M: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) L: linux-samsung-soc@xxxxxxxxxxxxxxx @@ -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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-samsung-soc@xxxxxxxxxxxxxxx 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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> L: alsa-devel@xxxxxxxxxxxxxxxx (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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-crypto@xxxxxxxxxxxxxxx L: linux-samsung-soc@xxxxxxxxxxxxxxx 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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> L: linux-kernel@xxxxxxxxxxxxxxx L: linux-samsung-soc@xxxxxxxxxxxxxxx @@ -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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Krzysztof Opasiak <k.opasiak@xxxxxxxxxxx> L: linux-nfc@xxxxxxxxxxxx (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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Vladimir Zapolskiy <vz@xxxxxxxxx> L: linux-crypto@xxxxxxxxxxxxxxx L: linux-samsung-soc@xxxxxxxxxxxxxxx @@ -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@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> M: Andi Shyti <andi@xxxxxxxxxxx> L: linux-spi@xxxxxxxxxxxxxxx L: linux-samsung-soc@xxxxxxxxxxxxxxx -- 2.32.0
