path: root/.mailmap
diff options
authorLinus Torvalds <>2021-02-21 13:18:26 -0800
committerLinus Torvalds <>2021-02-21 13:18:26 -0800
commit2671fe5e1d48fe2c14a46bdf8fd9d7b24f88c1e2 (patch)
treed388a72f779c2c6f48b1484f7a5162d7026dceaa /.mailmap
parentb811b41024afa1271afc5af84f663515d9227554 (diff)
parentb0c2793bad0b5f10be2fc5f56df827e0c1bbf4af (diff)
Merge tag 'mips_5.12' of git://
Pull MIPS updates from Thomas Bogendoerfer: - added support for Nintendo N64 - added support for Realtek RTL83XX SoCs - kaslr support for Loongson64 - first steps to get rid of set_fs() - DMA runtime coherent/non-coherent selection cleanup - cleanups and fixes * tag 'mips_5.12' of git:// (98 commits) Revert "MIPS: Add basic support for ptrace single step" catch more UBSAN symbols into .data MIPS: kernel: Drop kgdb_call_nmi_hook MAINTAINERS: Add git tree for KVM/mips MIPS: Use common way to parse elfcorehdr MIPS: Simplify EVA cache handling Revert "MIPS: kernel: {ftrace,kgdb}: Set correct address limit for cache flushes" MIPS: remove CONFIG_DMA_PERDEV_COHERENT MIPS: remove CONFIG_DMA_MAYBE_COHERENT driver core: lift dma_default_coherent into common code MIPS: refactor the runtime coherent vs noncoherent DMA indicators MIPS/alchemy: factor out the DMA coherent setup MIPS/malta: simplify plat_setup_iocoherency MIPS: Add basic support for ptrace single step MAINTAINERS: replace non-matching patterns for loongson{2,3} MIPS: Make check condition for SDBBP consistent with EJTAG spec mips: Replace links with lore Revert "MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op" MIPS: crash_dump.c: Simplify copy_oldmem_page() Revert "mips: Manually call fdt_init_reserved_mem() method" ...
Diffstat (limited to '.mailmap')
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 7fdf87b24fe8..ade90fc9140a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -202,6 +202,7 @@ Li Yang <> <>
Li Yang <> <>
Lukasz Luba <> <>
Maciej W. Rozycki <> <>
+Maciej W. Rozycki <> <>
Manivannan Sadhasivam <> <>
Manivannan Sadhasivam <> <>
Marcin Nowakowski <> <>