1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index addc36ae88..e057487e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-30  Florian Weimer  <fweimer@redhat.com>
+
+	Do not scale NPTL tests with available number of CPUs.
+	* nptl/tst-cond16.c (count): Set to constant value of 8.
+	* nptl/tst-cond18.c (count): Likewise.
+
 2017-08-29  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #22035]