Commit 6f649983 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-mar-17-2020' into staging 



MIPS queue for March 17th, 2020

# gpg: Signature made Tue 17 Mar 2020 12:53:50 GMT
# gpg:                using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01  DD75 D497 2A89 67F7 5A65

* remotes/amarkovic/tags/mips-queue-mar-17-2020:
  MAINTAINERS: Add a file to the main MIPS section
  MAINTAINERS: Adjust maintainer's email
  MAINTAINERS: Adjust maintainer's status for some MIPS items

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6fb1603a c0ac595b

.mailmap

+3 −2
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu 
Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>



# Next, replace old addresses by a more recent one.

Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>

Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>

Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com>

Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com>

Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com>

Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> <arikalo@wavecomp.com>

Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

MAINTAINERS

+12 −9
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ F: hw/microblaze/ 
F: disas/microblaze.c



MIPS TCG CPUs

M: Aurelien Jarno <aurelien@aurel32.net>

M: Aleksandar Markovic <amarkovic@wavecomp.com>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aurelien Jarno <aurelien@aurel32.net>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

S: Maintained

F: target/mips/
@@ -226,6 +226,7 @@ F: include/hw/mips/ 
F: include/hw/misc/mips_*

F: include/hw/timer/mips_gictimer.h

F: tests/acceptance/linux_ssh_mips_malta.py

F: tests/acceptance/machine_mips_malta.py

F: tests/tcg/mips/

K: ^Subject:.*(?i)mips
@@ -367,7 +368,7 @@ S: Maintained 
F: target/arm/kvm.c



MIPS KVM CPUs

M: Aleksandar Markovic <aleksandar.m.mail@gmail.com>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

S: Odd Fixes

F: target/mips/kvm.c
@@ -1018,7 +1019,7 @@ F: hw/display/jazz_led.c 
F: hw/dma/rc4030.c



Malta

M: Aleksandar Markovic <amarkovic@wavecomp.com>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

M: Philippe Mathieu-Daudé <f4bug@amsat.org>

R: Aurelien Jarno <aurelien@aurel32.net>

S: Maintained
@@ -1031,21 +1032,22 @@ F: tests/acceptance/linux_ssh_mips_malta.py 
F: tests/acceptance/machine_mips_malta.py



Mipssim

M: Aleksandar Markovic <amarkovic@wavecomp.com>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

S: Odd Fixes

F: hw/mips/mips_mipssim.c

F: hw/net/mipsnet.c



R4000

M: Aurelien Jarno <aurelien@aurel32.net>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aurelien Jarno <aurelien@aurel32.net>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

S: Obsolete

F: hw/mips/mips_r4k.c



Fulong 2E

M: Philippe Mathieu-Daudé <f4bug@amsat.org>

M: Aleksandar Markovic <amarkovic@wavecomp.com>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

S: Odd Fixes

F: hw/mips/mips_fulong2e.c

F: hw/isa/vt82c686.c
@@ -2509,7 +2511,8 @@ F: tcg/i386/ 
F: disas/i386.c



MIPS TCG target

M: Aurelien Jarno <aurelien@aurel32.net>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Aurelien Jarno <aurelien@aurel32.net>

R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>

S: Maintained

F: tcg/mips/
@@ -2837,7 +2840,7 @@ S: Odd Fixes 
F: scripts/git-submodule.sh



UI translations

M: Aleksandar Markovic <aleksandar.m.mail@gmail.com>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

F: po/*.po



Sphinx documentation configuration and build machinery