commit f8b4e87d5d4f57954b50677add76ce5136211dc1 (HEAD, refs/remotes/origin/master)
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 2 22:38:01 2018 -0800

    Fix .gdbinit to work with Lisp_Word
    
    Problem reported by Stefan Monnier (Bug#29957).
    * src/.gdbinit (xgetptr, xgetint, xgettype):
    Cast Lisp_Word value to EMACS_INT, since it might be a pointer now.

diff --git a/src/.gdbinit b/src/.gdbinit
index de35ef1be7..a5411e66d5 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -49,7 +49,7 @@ define xgetptr
   else
     set $bugfix = $arg0
   end
-  set $ptr = $bugfix & VALMASK
+  set $ptr = (EMACS_INT) $bugfix & VALMASK
 end
 
 define xgetint
@@ -58,7 +58,7 @@ define xgetint
   else
     set $bugfix = $arg0
   end
-  set $int = $bugfix << (USE_LSB_TAG ? 0 : INTTYPEBITS) >> INTTYPEBITS
+  set $int = (EMACS_INT) $bugfix << (USE_LSB_TAG ? 0 : INTTYPEBITS) >> INTTYPEBITS
 end
 
 define xgettype
@@ -67,7 +67,7 @@ define xgettype
   else
     set $bugfix = $arg0
   end
-  set $type = (enum Lisp_Type) (USE_LSB_TAG ? $bugfix & (1 << GCTYPEBITS) - 1 : (EMACS_UINT) $bugfix >> VALBITS)
+  set $type = (enum Lisp_Type) (USE_LSB_TAG ? (EMACS_INT) $bugfix & (1 << GCTYPEBITS) - 1 : (EMACS_UINT) $bugfix >> VALBITS)
 end
 
 define xgetsym

commit b6add8c7cfc6d36f9dd8ad99be06bd8ab41cc6f8
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Date:   Tue Jan 2 07:28:06 2018 -0600

    Fix description of 'struct' generic function specializer
    
    * doc/lispref/functions.texi (Generic Functions): Fix description of
    'struct' specializer; it must be the named struct or a child, not a
    parent.

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 165ac75966..c3e5dc0eb5 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1246,10 +1246,10 @@ This specializer requires the argument be @code{eql} to the given
 @item (head @var{object})
 The argument must be a cons cell whose @code{car} is @code{eql} to
 @var{object}.
-@item @var{struct-tag}
-The argument must be an instance of a class named @var{struct-tag}
+@item @var{struct-type}
+The argument must be an instance of a class named @var{struct-type}
 defined with @code{cl-defstruct} (@pxref{Structures,,, cl, Common Lisp
-Extensions for GNU Emacs Lisp}), or of one of its parent classes.
+Extensions for GNU Emacs Lisp}), or of one of its child classes.
 @end table
 
 Method definitions can make use of a new argument-list keyword,

commit cef8a9d0a7104626b0c238d6298e1d47c196306c
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Tue Jan 2 11:25:21 2018 +0100

    Remove superfluous test data for Tramp

diff --git a/test/lisp/net/tramp-archive-resources/bar/bar b/test/lisp/net/tramp-archive-resources/bar/bar
deleted file mode 100644
index 5716ca5987..0000000000
--- a/test/lisp/net/tramp-archive-resources/bar/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/test/lisp/net/tramp-archive-resources/foo.hrd b/test/lisp/net/tramp-archive-resources/foo.hrd
deleted file mode 100644
index 257cc5642c..0000000000
--- a/test/lisp/net/tramp-archive-resources/foo.hrd
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/test/lisp/net/tramp-archive-resources/foo.lnk b/test/lisp/net/tramp-archive-resources/foo.lnk
deleted file mode 100644
index 257cc5642c..0000000000
--- a/test/lisp/net/tramp-archive-resources/foo.lnk
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/test/lisp/net/tramp-archive-resources/foo.txt b/test/lisp/net/tramp-archive-resources/foo.txt
deleted file mode 100644
index 257cc5642c..0000000000
--- a/test/lisp/net/tramp-archive-resources/foo.txt
+++ /dev/null
@@ -1 +0,0 @@
-foo