diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-27 01:43:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-27 01:43:12 +0200 |
| commit | 5a1e843c66fa6438f389045981c37e4073917641 (patch) | |
| tree | 90b84c64ea215ed214f1d15b3a0b33200aff7370 /.mailmap | |
| parent | Merge tag 'tty-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | MIPS: tlbex: Fix build_restore_pagemask KScratch restore (diff) | |
| download | linux-5a1e843c66fa6438f389045981c37e4073917641.tar.xz linux-5a1e843c66fa6438f389045981c37e4073917641.zip | |
Merge tag 'mips_fixes_5.4_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Paul Burton:
"A few MIPS fixes:
- Fix VDSO time-related function behavior for systems where we need
to fall back to syscalls, but were instead returning bogus results.
- A fix to TLB exception handlers for Cavium Octeon systems where
they would inadvertently clobber the $1/$at register.
- A build fix for bcm63xx configurations.
- Switch to using my @kernel.org email address"
* tag 'mips_fixes_5.4_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: tlbex: Fix build_restore_pagemask KScratch restore
MIPS: bmips: mark exception vectors as char arrays
mips: vdso: Fix __arch_get_hw_counter()
MAINTAINERS: Use @kernel.org address for Paul Burton
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -196,7 +196,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de> Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de> Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Patrick Mochel <mochel@digitalimplant.org> -Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com> +Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com> +Paul Burton <paulburton@kernel.org> <paul.burton@mips.com> Peter A Jonsson <pj@ludd.ltu.se> Peter Oruba <peter@oruba.de> Peter Oruba <peter.oruba@amd.com> |