Use Krzysztof Kozlowski's @kernel.org account in maintainer entries. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> --- Hi Arnd and Olof, Could you take this one directly for fixes? My email address also appears in the bindings. For now mailmap will handle it. I will change it after merge window, because some of the bindings are in separate for-next branches. --- .mailmap | 1 + MAINTAINERS | 34 ++++++++++++++--------------- drivers/soc/samsung/exynos-chipid.c | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.mailmap b/.mailmap index 29a45c106dfb..f9781674e7e7 100644 --- a/.mailmap +++ b/.mailmap @@ -217,6 +217,7 @@ Koushik <raghavendra.koushik@xxxxxxxxxxxx> Krishna Manikandan <quic_mkrishn@xxxxxxxxxxx> <mkrishn@xxxxxxxxxxxxxx> 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> Kuogee Hsieh <quic_khsieh@xxxxxxxxxxx> <khsieh@xxxxxxxxxxxxxx> Leonardo Bras <leobras.c@xxxxxxxxx> <leonardo@xxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index d7ea92ce1b1d..4e88b4e17e35 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2627,7 +2627,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> R: Alim Akhtar <alim.akhtar@xxxxxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) L: linux-samsung-soc@xxxxxxxxxxxxxxx @@ -11852,7 +11852,7 @@ F: drivers/iio/proximity/mb1232.c MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS R: Iskren Chernev <iskren.chernev@xxxxxxxxx> -R: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> +R: Krzysztof Kozlowski <krzk@xxxxxxxxxx> R: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> R: Matheus Castello <matheus@xxxxxxxxxxxxxxx> L: linux-pm@xxxxxxxxxxxxxxx @@ -11862,7 +11862,7 @@ F: drivers/power/supply/max17040_battery.c MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS R: Hans de Goede <hdegoede@xxxxxxxxxx> -R: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> +R: Krzysztof Kozlowski <krzk@xxxxxxxxxx> R: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> R: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@xxxxxxx> R: Purism Kernel Team <kernel@xxxxxxx> @@ -11907,7 +11907,7 @@ F: Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml F: drivers/power/supply/max77976_charger.c 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 @@ -11917,7 +11917,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 @@ -12607,7 +12607,7 @@ F: mm/memblock.c F: tools/testing/memblock/ 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 @@ -13748,7 +13748,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 @@ -14062,7 +14062,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 @@ -15515,7 +15515,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> R: Alim Akhtar <alim.akhtar@xxxxxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) @@ -17193,7 +17193,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 @@ -17238,7 +17238,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 @@ -17246,7 +17246,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 @@ -17281,7 +17281,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 @@ -17307,7 +17307,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 @@ -17329,7 +17329,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 @@ -17364,7 +17364,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 @@ -17382,7 +17382,7 @@ F: drivers/net/ethernet/samsung/sxgbe/ SAMSUNG THERMAL DRIVER M: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> -M: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx> +M: Krzysztof Kozlowski <krzk@xxxxxxxxxx> L: linux-pm@xxxxxxxxxxxxxxx L: linux-samsung-soc@xxxxxxxxxxxxxxx S: Maintained diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 2746d05936d3..0fb3631e7346 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -204,7 +204,7 @@ module_platform_driver(exynos_chipid_driver); MODULE_DESCRIPTION("Samsung Exynos ChipID controller and ASV driver"); MODULE_AUTHOR("Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>"); -MODULE_AUTHOR("Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx>"); +MODULE_AUTHOR("Krzysztof Kozlowski <krzk@xxxxxxxxxx>"); MODULE_AUTHOR("Pankaj Dubey <pankaj.dubey@xxxxxxxxxxx>"); MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>"); MODULE_LICENSE("GPL"); -- 2.32.0
