diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-05 17:05:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-05 17:05:38 -0700 |
| commit | 815b196c7057356e7ffa9ce97892cb5fd5de17e0 (patch) | |
| tree | 9c8c544a1b8037d5eb2c7ca7c99758abd3c7efa4 /.mailmap | |
| parent | e17fee8976c3d2ccf9add6d6c8912a37b025d840 (diff) | |
| parent | a19cad0691597eb79c123b8a19a9faba5ab7d90e (diff) | |
| download | linux-815b196c7057356e7ffa9ce97892cb5fd5de17e0.tar.gz | |
Merge tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull mm hotfixes from Andrew Morton: "Fixups for various recently-added and longer-term issues and a few minor tweaks: - fixes for material merged during this merge window - cc:stable fixes for more longstanding issues - minor mailmap and MAINTAINERS updates" * tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery x86/kexec: fix memory leak of elf header buffer mm/memremap: fix missing call to untrack_pfn() in pagemap_range() mm: page_isolation: use compound_nr() correctly in isolate_single_pageblock() mm: hugetlb_vmemmap: fix CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON MAINTAINERS: add maintainer information for z3fold mailmap: update Josh Poimboeuf's email
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap index 9ba38a82aba4..825fae8e6b7b 100644 --- a/.mailmap +++ b/.mailmap @@ -201,6 +201,8 @@ Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org> <josh@joshtriplett.org> <josht@linux.vnet.ibm.com> <josh@joshtriplett.org> <josht@us.ibm.com> <josh@joshtriplett.org> <josht@vnet.ibm.com> +Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@redhat.com> +Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@us.ibm.com> Juha Yrjola <at solidboot.com> Juha Yrjola <juha.yrjola@nokia.com> Juha Yrjola <juha.yrjola@solidboot.com> |