commit 1c7166a3ba399efbefc65feb8a6a41ef0dfa33a4 (HEAD, refs/remotes/origin/master)
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Aug 26 22:32:05 2016 +0300

    Fix etags test suite messed up by merges from emacs-25
    
    * test/manual/etags/go-src/test.go:
    * test/manual/etags/go-src/test1.go: Move from test/etags/.
    * test/manual/etags/ruby-src/test1.ru: Replace test1.ruby.
    * test/etags/: Directory deleted.

diff --git a/test/etags/go-src/test.go b/test/manual/etags/go-src/test.go
similarity index 100%
rename from test/etags/go-src/test.go
rename to test/manual/etags/go-src/test.go
diff --git a/test/etags/go-src/test1.go b/test/manual/etags/go-src/test1.go
similarity index 100%
rename from test/etags/go-src/test1.go
rename to test/manual/etags/go-src/test1.go
diff --git a/test/etags/ruby-src/test1.ru b/test/manual/etags/ruby-src/test1.ru
similarity index 100%
rename from test/etags/ruby-src/test1.ru
rename to test/manual/etags/ruby-src/test1.ru
diff --git a/test/manual/etags/ruby-src/test1.ruby b/test/manual/etags/ruby-src/test1.ruby
deleted file mode 100644
index 26b7d53..0000000
--- a/test/manual/etags/ruby-src/test1.ruby
+++ /dev/null
@@ -1,29 +0,0 @@
-class A
- def a()
-  super(" do ")
- end
- def b()
- end
-end
-
-module A
-  class B
-    ABC = 4
-
-    def foo!
-    end
-
-    def self._bar?(abc)
-    end
-
-    class << self
-      def qux=(tee)
-      end
-    end
-  end
-end
-
-A::Constant = 5
-
-# def foo_in_comment
-# end

commit 09428ffc633450d2ce584b6ac63426a16759f859
Author: Simen Heggestøyl <simenheg@gmail.com>
Date:   Fri Aug 26 19:16:47 2016 +0200

    Add "supports" to list of CSS at-rules
    
    * lisp/textmodes/css-mode.el (css-at-ids): Add "supports" at-rule.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 261826e..4d8170e 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -56,7 +56,7 @@
 
 (defconst css-at-ids
   '("charset" "font-face" "import" "keyframes" "media" "namespace"
-    "page")
+    "page" "supports")
   "Identifiers that appear in the form @foo.")
 
 (defconst scss-at-ids

commit 4a46232d92e7af257e1bccf2958e3362daa976dc
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Fri Aug 26 15:12:42 2016 +0200

    * lisp/net/tramp-sh.el (tramp-get-remote-perl): Perform a basic check.
    
    (Bug#22478)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index bbc74fc..9afa85e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -5368,16 +5368,20 @@ Nonexistent directories are removed from spec."
     (tramp-message vec 5 "Finding a suitable `perl' command")
     (let ((result
 	   (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec))
-	       (tramp-find-executable
-		vec "perl" (tramp-get-remote-path vec)))))
+	       (tramp-find-executable vec "perl" (tramp-get-remote-path vec)))))
+      ;; Perform a basic check.
+      (and result
+	   (null (tramp-send-command-and-check
+		  vec (format "%s -e 'print \"Hello\n\";'" result)))
+	   (setq result nil))
       ;; We must check also for some Perl modules.
       (when result
 	(with-tramp-connection-property vec "perl-file-spec"
-	   (tramp-send-command-and-check
-	    vec (format "%s -e 'use File::Spec;'" result)))
+	  (tramp-send-command-and-check
+	   vec (format "%s -e 'use File::Spec;'" result)))
 	(with-tramp-connection-property vec "perl-cwd-realpath"
-	   (tramp-send-command-and-check
-	    vec (format "%s -e 'use Cwd \"realpath\";'" result))))
+	  (tramp-send-command-and-check
+	   vec (format "%s -e 'use Cwd \"realpath\";'" result))))
       result)))
 
 (defun tramp-get-remote-stat (vec)