X:     drivers/iio/*/adjd*
 
 ANALOGBITS PLL LIBRARIES
-M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Paul Walmsley <pjw@kernel.org>
 M:     Samuel Holland <samuel.holland@sifive.com>
 S:     Supported
 F:     drivers/clk/analogbits/*
 F:     drivers/pci/controller/dwc/*layerscape*
 
 PCI DRIVER FOR FU740
-M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Paul Walmsley <pjw@kernel.org>
 M:     Greentime Hu <greentime.hu@sifive.com>
 M:     Samuel Holland <samuel.holland@sifive.com>
 L:     linux-pci@vger.kernel.org
 F:     arch/riscv/boot/dts/andes/
 
 RISC-V ARCHITECTURE
-M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Paul Walmsley <pjw@kernel.org>
 M:     Palmer Dabbelt <palmer@dabbelt.com>
 M:     Albert Ou <aou@eecs.berkeley.edu>
 R:     Alexandre Ghiti <alex@ghiti.fr>
 F:     drivers/watchdog/simatic-ipc-wdt.c
 
 SIFIVE DRIVERS
-M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Paul Walmsley <pjw@kernel.org>
 M:     Samuel Holland <samuel.holland@sifive.com>
 L:     linux-riscv@lists.infradead.org
 S:     Supported