The old email is still active, but for easier handling, I am going to use my kernel.org address from now on. Also, add a mailmap for the now defunct Pengutronix address. Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxx> --- .mailmap | 2 ++ MAINTAINERS | 2 +- drivers/i2c/i2c-core-base.c | 2 +- drivers/i2c/i2c-core-of.c | 2 +- include/linux/i2c.h | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index db3754a41018..4f906b4e9785 100644 --- a/.mailmap +++ b/.mailmap @@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@xxxxxxxxx> <vdavydov@xxxxxxxxxxxxx> Vladimir Davydov <vdavydov.dev@xxxxxxxxx> <vdavydov@xxxxxxxxxxxxx> Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx> Will Deacon <will@xxxxxxxxxx> <will.deacon@xxxxxxx> +Wolfram Sang <wsa@xxxxxxxxxx> <wsa@xxxxxxxxxxxxx> +Wolfram Sang <wsa@xxxxxxxxxx> <w.sang@xxxxxxxxxxxxxx> Yakir Yang <kuankuan.y@xxxxxxxxx> <ykk@xxxxxxxxxxxxxx> Yusuke Goda <goda.yusuke@xxxxxxxxxxx> Gustavo Padovan <gustavo@xxxxxxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 26f281d9f32a..46049787d27e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7949,7 +7949,7 @@ F: Documentation/i2c/busses/i2c-parport.rst F: drivers/i2c/busses/i2c-parport.c I2C SUBSYSTEM -M: Wolfram Sang <wsa@xxxxxxxxxxxxx> +M: Wolfram Sang <wsa@xxxxxxxxxx> L: linux-i2c@xxxxxxxxxxxxxxx S: Maintained W: https://i2c.wiki.kernel.org/ diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index a66912782064..ee013313b727 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -7,7 +7,7 @@ * Mux support by Rodolfo Giometti <giometti@xxxxxxxxxxxx> and * Michael Lawnick <michael.lawnick.ext@xxxxxxx> * - * Copyright (C) 2013-2017 Wolfram Sang <wsa@xxxxxxxxxxxxx> + * Copyright (C) 2013-2017 Wolfram Sang <wsa@xxxxxxxxxx> */ #define pr_fmt(fmt) "i2c-core: " fmt diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6787c1f71483..3ed74aa4b44b 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -5,7 +5,7 @@ * Copyright (C) 2008 Jochen Friedrich <jochen@xxxxxxxx> * based on a previous patch from Jon Smirl <jonsmirl@xxxxxxxxx> * - * Copyright (C) 2013, 2018 Wolfram Sang <wsa@xxxxxxxxxxxxx> + * Copyright (C) 2013, 2018 Wolfram Sang <wsa@xxxxxxxxxx> */ #include <dt-bindings/i2c/i2c.h> diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 45d36ba4826b..49d29054e657 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -2,7 +2,7 @@ /* * i2c.h - definitions for the Linux i2c bus interface * Copyright (C) 1995-2000 Simon G. Vogl - * Copyright (C) 2013-2019 Wolfram Sang <wsa@xxxxxxxxxxxxx> + * Copyright (C) 2013-2019 Wolfram Sang <wsa@xxxxxxxxxx> * * With some changes from Kyösti Mälkki <kmalkki@xxxxxxxxx> and * Frodo Looijaard <frodol@xxxxxx> -- 2.20.1
