diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-11 11:18:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-11 11:18:04 -0700 |
| commit | 3dd0130f2430decf0cb001b452824515436986d2 (patch) | |
| tree | 3d3bb4ca9c5fe7372eb499bf9983d514ec2f5477 /MAINTAINERS | |
| parent | 5b697f86f9f136d200c9827d6eca0437b7eb96cf (diff) | |
| parent | 4aab2be0983031a05cb4a19696c9da5749523426 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Five fixes.
Subsystems affected by this patch series: MAINTAINERS, mm/pagemap,
mm/swap, and mm/hugetlb"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
mm: validate inode in mapping_set_error()
mm: mmap: Fix general protection fault in unlink_file_vma()
MAINTAINERS: Antoine Tenart's email address
MAINTAINERS: change hardening mailing list
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e83aee101b66..867157311dc8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1628,7 +1628,7 @@ N: meson ARM/Annapurna Labs ALPINE ARCHITECTURE M: Tsahee Zidenberg <tsahee@annapurnalabs.com> -M: Antoine Tenart <antoine.tenart@bootlin.com> +M: Antoine Tenart <atenart@kernel.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/boot/dts/alpine* @@ -7240,7 +7240,7 @@ F: drivers/staging/gasket/ GCC PLUGINS M: Kees Cook <keescook@chromium.org> R: Emese Revfy <re.emese@gmail.com> -L: kernel-hardening@lists.openwall.com +L: linux-hardening@vger.kernel.org S: Maintained F: Documentation/kbuild/gcc-plugins.rst F: scripts/Makefile.gcc-plugins @@ -8678,7 +8678,7 @@ F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ INSIDE SECURE CRYPTO DRIVER -M: Antoine Tenart <antoine.tenart@bootlin.com> +M: Antoine Tenart <atenart@kernel.org> L: linux-crypto@vger.kernel.org S: Maintained F: drivers/crypto/inside-secure/ @@ -9802,7 +9802,7 @@ F: drivers/scsi/53c700* LEAKING_ADDRESSES M: Tobin C. Harding <me@tobin.cc> M: Tycho Andersen <tycho@tycho.pizza> -L: kernel-hardening@lists.openwall.com +L: linux-hardening@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git F: scripts/leaking_addresses.pl |