diff --git a/.mailmap b/.mailmap
index 56876a30fbe..e4fd1b7bf3b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,9 @@ Andrea Corallo <akrl@sdf.org>
 Andrea Corallo <akrl@sdf.org> <akrl@sdf.com>
 Andrea Corallo <akrl@sdf.org> <andcor03@e112547.nice.arm.com>
 Andrea Corallo <akrl@sdf.org> <andrea_corallo@yahoo.it>
+Andrea Corallo <andrea.corallo@arm.com> <andcor03@e112547.nice.arm.com>
+Andrea Corallo <andrea.corallo@arm.com> <andcor03@e130743.arm.com>
+Andrea Corallo <andrea.corallo@arm.com> <andcor03@e132096.arm.com>
 Andrew G Cohen <cohen@andy.bu.edu>
 Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
 Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
@@ -68,6 +71,7 @@ Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
 Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <galli.87@gmail.com>
+Felicián Németh <felician.nemeth@gmail.com>
 Francis Litterio <flitterio@gmail.com>
 Gabor Vida <vidagabor@gmail.com>
 Gerd Möllmann <gerd@gnu.org>
@@ -79,14 +83,17 @@ Gnus developers <ding@gnus.org.noreply> <ding@gnus.org>
 Gregory Heytings <gregory@heytings.org> <ghe@sdf.org>
 Grégoire Jadi <daimrod@gmail.com>
 Ian Dunn <dunni@gnu.org>
+Ignacio Casso <ignaciocasso@hotmail.com>
 Jan Djärv <jan.h.d@swipnet.se>
 Jan Djärv <jan.h.d@swipnet.se> <jhd@f20.localdomain>
+Jan Synáček <jan.synacek@gmail.com>
 Jason Rumney <jasonr@gnu.org> <jasonr@wanchan>
 Jeff Walsh <fejfighter@gmail.com> <jawalsh@localhost.localdomain>
 Jeff Walsh <fejfighter@gmail.com> <jeff.walsh@drtusers-MacBook-Pro.local>
 Jeff Walsh <fejfighter@gmail.com> <jewalsh@redhat.com>
 Jens Lechtenbörger <jens.lechtenboerger@fsfe.org>
 Jim Blandy <jimb@red-bean.com> <jimb@redhat.com>
+Jim Meyering  <meyering@redhat.com> U. Ser <user@example.com>
 Jimmy Aguilar Mena <spacibba@aol.com>
 Joakim Verona <joakim@verona.se>
 Joakim Verona <joakim@verona.se> <root@exodia.verona.se>
@@ -151,6 +158,7 @@ Philip Kaludercic <philipk@posteo.net> <philip.kaludercic@fau.de>
 Philip Kaludercic <philipk@posteo.net> <philip@icterid>
 Philip Kaludercic <philipk@posteo.net> <philip@warpmail.net>
 Philipp Stephani <p.stephani2@gmail.com>
+Philipp Stephani <phst@google.com>
 Phillip Lord <phillip.lord@russet.org.uk> <phillip.lord@newcastle.ac.uk>
 Pierre Lorenzon <devel@pollock-nageoire.net>
 Pieter van Oostrum <pieter@vanoostrum.org> <pieter-l@vanoostrum.org>
@@ -158,8 +166,9 @@ Pip Cet <pipcet@gmail.com>
 Po Lu <luangruo@yahoo.com>
 Po Lu <luangruo@yahoo.com> Po Lu via <emacs-devel@gnu.org>
 Przemysław Wojnowski <esperanto@cumego.com>
-Rasmus <rasmus@gmx.us>
+Rasmus Pank Roulund <rasmus@gmx.us>
 Richard M. Stallman <rms@gnu.org>
+Robert Brown <robert.brown@gmail.com>
 Robert J. Chassell <bob@gnu.org> <bob@rattlesnake.com>
 Robert Weiner <rsw@gnu.org> <rswgnu@gmail.com>
 Roland Winkler <winkler@gnu.org> <Roland.Winkler@physik.uni-erlangen.de>
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index ee72a04f493..5c95afa67ca 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2815,6 +2815,19 @@ set the 'visible-cursor' variable to nil in your ~/.emacs:
 Still other way is to change the "cvvis" capability to send the
 "\E[?25h\E[?0c" command.
 
+*** GNU/Linux: GPM mouse does not display pointer, but otherwise works.
+
+This happens on Linux kernel versions from 6.7 to 6.13.  On these
+versions, the Linux kernel does not allow programs to draw the mouse
+pointer unless they have superuser permissions.  The GPM daemon
+normally has such permissions and it draws the mouse pointer for other
+programs such as your shell and many ncurses based programs, but not
+for Emacs.
+
+To solve this, you need to change your kernel to a version with this bug
+fixed, such as 6.14 or later.  See associated Linux kernel fix:
+https://lore.kernel.org/regressions/20250110142122.1013222-1-gnoack@google.com/
+
 ** FreeBSD
 
 *** FreeBSD: Getting a Meta key on the console.
diff --git a/lisp/help.el b/lisp/help.el
index a5f65866c01..91e036621f8 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -2309,7 +2309,7 @@ the same names as used in the original source code, when possible."
             (dolist (arg arglist)
               (unless (and (symbolp arg)
                            (let ((name (symbol-name arg)))
-                             (if (eq (aref name 0) ?&)
+                             (if (and (> (length name) 0) (eq (aref name 0) ?&))
                                  (memq arg '(&rest &optional))
                                (not (string-search "." name)))))
                 (setq valid nil)))