On Fri, Dec 3, 2021 at 9:40 PM Steven Price <steven.price@xxxxxxx> wrote: > > On 02/12/2021 23:58, Atish Patra wrote: > > I am no longer employed by western digital. Update my email address to > > personal one and add entries to .mailmap as well. > > > > Signed-off-by: Atish Patra <atishp@xxxxxxxxxxxxxx> > > --- > > .mailmap | 1 + > > MAINTAINERS | 2 +- > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/.mailmap b/.mailmap > > index 6277bb27b4bf..23f6b0a60adf 100644 > > --- a/.mailmap > > +++ b/.mailmap > > @@ -50,6 +50,7 @@ Archit Taneja <archit@xxxxxx> > > Ard Biesheuvel <ardb@xxxxxxxxxx> <ard.biesheuvel@xxxxxxxxxx> > > Arnaud Patard <arnaud.patard@xxxxxxxxxxx> > > Arnd Bergmann <arnd@xxxxxxxx> > > +Atish Patra <atishp@xxxxxxxxxxxxxx> <atish.patra@xxxxxxx> <atishp@xxxxxxxxxxxx> > > I don't think this does what you expect. You can't list more than one > email address to replace on the same line. You can use the command "git > check-mailmap" to test what happens, e.g. with this change applied: > > $ git check-mailmap "<atishp@xxxxxxxxxxxx>" > <atishp@xxxxxxxxxxxx> > $ git check-mailmap "<atish.patra@xxxxxxx>" > Atish Patra <atishp@xxxxxxxxxxxxxx> > $ git check-mailmap "<atishp@xxxxxxxxxxxxxx>" > <atishp@xxxxxxxxxxxxxx> > > So only your @wdc.com address is translated. If you want to translate > the @rivosinc.com address as well you need a second line. As the file says: Thanks Steve for noticing this. Even, I realized this while queuing the patch. I have removed @rivosinc.com email address from the patch in my queue. I believe Atish currently uses both personal and @rivosinc.com email addresses on LKML. Refer, https://github.com/kvm-riscv/linux/commit/2255b100410179bb8151e99e8396debddea0ef1d https://github.com/kvm-riscv/linux/commits/riscv_kvm_queue Regards, Anup > > # For format details, see "MAPPING AUTHORS" in "man git-shortlog". > > Steve > > > Axel Dyks <xl@xxxxxxxxxxxx> > > Axel Lin <axel.lin@xxxxxxxxx> > > Bart Van Assche <bvanassche@xxxxxxx> <bart.vanassche@xxxxxxxxxxx> > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 5250298d2817..6c2a34da0314 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -10434,7 +10434,7 @@ F: arch/powerpc/kvm/ > > > > KERNEL VIRTUAL MACHINE FOR RISC-V (KVM/riscv) > > M: Anup Patel <anup.patel@xxxxxxx> > > -R: Atish Patra <atish.patra@xxxxxxx> > > +R: Atish Patra <atishp@xxxxxxxxxxxxxx> > > L: kvm@xxxxxxxxxxxxxxx > > L: kvm-riscv@xxxxxxxxxxxxxxxxxxx > > L: linux-riscv@xxxxxxxxxxxxxxxxxxx > > >