i2c: use my kernel.org address from now on

wsakernel · wsakernel · commit 2f5a55c52c00 · 2020-05-05T16:29:09.000+02:00
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 &lt;wsa@kernel.org&gt;
diff --git a/.mailmap b/.mailmap
@@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Will Deacon <will@kernel.org> <will.deacon@arm.com>
+Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
+Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
 Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
 Yusuke Goda <goda.yusuke@renesas.com>
 Gustavo Padovan <gustavo@las.ic.unicamp.br>
diff --git 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@the-dreams.de>
+M:	Wolfram Sang <wsa@kernel.org>
 L:	linux-i2c@vger.kernel.org
 S:	Maintained
 W:	https://i2c.wiki.kernel.org/
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
@@ -7,7 +7,7 @@
  *   Mux support by Rodolfo Giometti <giometti@enneenne.com> and
  *   Michael Lawnick <michael.lawnick.ext@nsn.com>
  *
- * Copyright (C) 2013-2017 Wolfram Sang <wsa@the-dreams.de>
+ * Copyright (C) 2013-2017 Wolfram Sang <wsa@kernel.org>
  */
 
 #define pr_fmt(fmt) "i2c-core: " fmt
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2008 Jochen Friedrich <jochen@scram.de>
  * based on a previous patch from Jon Smirl <jonsmirl@gmail.com>
  *
- * Copyright (C) 2013, 2018 Wolfram Sang <wsa@the-dreams.de>
+ * Copyright (C) 2013, 2018 Wolfram Sang <wsa@kernel.org>
  */
 
 #include <dt-bindings/i2c/i2c.h>
diff --git 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@the-dreams.de>
+ * Copyright (C) 2013-2019 Wolfram Sang <wsa@kernel.org>
  *
  * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
  * Frodo Looijaard <frodol@dds.nl>

-Original file line number
+Diff line change
 Vladimir Davydov <[email protected]> <[email protected]>
 Takashi YOSHII <[email protected]>
 Will Deacon <[email protected]> <[email protected]>
 +Wolfram Sang <[email protected]> <[email protected]>
 +Wolfram Sang <[email protected]> <[email protected]>
 Yakir Yang <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
 Gustavo Padovan <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Mux support by Rodolfo Giometti <[email protected]> and`
`8`	`8`	`* Michael Lawnick <[email protected]>`
`9`	`9`	`*`
`10`		`- * Copyright (C) 2013-2017 Wolfram Sang <wsa@the-dreams.de>`
	`10`	`+ * Copyright (C) 2013-2017 Wolfram Sang <wsa@kernel.org>`
`11`	`11`	`*/`
`12`	`12`
`13`	`13`	`#define pr_fmt(fmt) "i2c-core: " fmt`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Copyright (C) 2008 Jochen Friedrich <[email protected]>`
`6`	`6`	`* based on a previous patch from Jon Smirl <[email protected]>`
`7`	`7`	`*`
`8`		`- * Copyright (C) 2013, 2018 Wolfram Sang <wsa@the-dreams.de>`
	`8`	`+ * Copyright (C) 2013, 2018 Wolfram Sang <wsa@kernel.org>`
`9`	`9`	`*/`
`10`	`10`
`11`	`11`	`#include <dt-bindings/i2c/i2c.h>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`/*`
`3`	`3`	`* i2c.h - definitions for the Linux i2c bus interface`
`4`	`4`	`* Copyright (C) 1995-2000 Simon G. Vogl`
`5`		`- * Copyright (C) 2013-2019 Wolfram Sang <wsa@the-dreams.de>`
	`5`	`+ * Copyright (C) 2013-2019 Wolfram Sang <wsa@kernel.org>`
`6`	`6`	`*`
`7`	`7`	`* With some changes from Kyösti Mälkki <[email protected]> and`
`8`	`8`	`* Frodo Looijaard <[email protected]>`