diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0aa99c6fc13..66351eafee5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-29  Pedro Alves  <palves@redhat.com>
+
+	PR gdb/17408
+	* infrun.c (switch_back_to_stepped_thread): Use currently_stepping
+	instead of assuming a thread with a stepping range is always
+	stepping.
+
 2014-10-29  Pedro Alves  <palves@redhat.com>
 
 	PR python/17372
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 367187ab9c6..e4a2bf62b59 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,31 @@
+2014-10-29  Pedro Alves  <palves@redhat.com>
+
+	PR gdb/17408
+	* gdb.threads/schedlock.c (some_function): New function.
+	(call_function): New global.
+	(MAYBE_CALL_SOME_FUNCTION): New macro.
+	(thread_function): Call it.
+	* gdb.threads/schedlock.exp (get_args): Add description parameter,
+	and use it instead of a global counter.  Adjust all callers.
+	(get_current_thread): Use "find current thread" for test message
+	here rather than having all callers pass down the same string.
+	(goto_loop): New procedure, factored out from ...
+	(my_continue): ... this.
+	(step_ten_loops): Change parameter from test message to command to
+	use.  Adjust.
+	(list_count): Delete global.
+	(check_result): New procedure, factored out from duplicate top
+	level code.
+	(continue tests): Wrap in with_test_prefix.
+	(test_step): New procedure, factored out from duplicate top level
+	code.
+	(top level): Test "step" in combination with all scheduler-locking
+	modes.  Test "next" in combination with all scheduler-locking
+	modes, and in combination with stepping over a function call or
+	not.
+	* gdb.threads/next-bp-other-thread.c: New file.
+	* gdb.threads/next-bp-other-thread.exp: New file.
+
 2014-10-29  Pedro Alves  <palves@redhat.com>
 
 	PR python/17372