Redirect some older email addresses that are in the git logs. Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxx> --- .mailmap | 7 +++++++ MAINTAINERS | 6 +++--- include/linux/xarray.h | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 29ddeb1bf015..a80dca923d32 100644 --- a/.mailmap +++ b/.mailmap @@ -114,6 +114,13 @@ Mark Brown <broonie@xxxxxxxxxxxxx> Mark Yao <markyao0591@xxxxxxxxx> <mark.yao@xxxxxxxxxxxxxx> Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxxxxxxxxxxxxxxxx> Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxxxxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <matthew.r.wilcox@xxxxxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <matthew@xxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <mawilcox@xxxxxxxxxxxxxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <mawilcox@xxxxxxxxxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <willy@xxxxxxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <willy@xxxxxxxxxxxxxxx> +Matthew Wilcox <willy@xxxxxxxxxxxxx> <willy@xxxxxxxxxxxxxxxx> Matthieu CASTET <castet.matthieu@xxxxxxx> Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> <mchehab@xxxxxxxxxxxxxx> Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> <maurochehab@xxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index f15bc83753f5..6dc2c9cb2d7b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -529,7 +529,7 @@ F: Documentation/hwmon/adt7475 F: drivers/hwmon/adt7475.c ADVANSYS SCSI DRIVER -M: Matthew Wilcox <matthew@xxxxxx> +M: Matthew Wilcox <willy@xxxxxxxxxxxxx> M: Hannes Reinecke <hare@xxxxxxxx> L: linux-scsi@xxxxxxxxxxxxxxx S: Maintained @@ -4268,7 +4268,7 @@ S: Maintained F: drivers/i2c/busses/i2c-diolan-u2c.c FILESYSTEM DIRECT ACCESS (DAX) -M: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> +M: Matthew Wilcox <willy@xxxxxxxxxxxxx> M: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx> L: linux-fsdevel@xxxxxxxxxxxxxxx S: Supported @@ -8452,7 +8452,7 @@ F: drivers/message/fusion/ F: drivers/scsi/mpt3sas/ LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers -M: Matthew Wilcox <matthew@xxxxxx> +M: Matthew Wilcox <willy@xxxxxxxxxxxxx> L: linux-scsi@xxxxxxxxxxxxxxx S: Maintained F: drivers/scsi/sym53c8xx_2/ diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 2dfc8006fe64..9e4c86853fa4 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -4,7 +4,7 @@ /* * eXtensible Arrays * Copyright (c) 2017 Microsoft Corporation - * Author: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> + * Author: Matthew Wilcox <willy@xxxxxxxxxxxxx> */ #include <linux/spinlock.h> -- 2.17.1
