1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 03bba82de7..c2d99a027b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-10  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #12847]
+	* sysdeps/nptl/fork.c (fresetlockfiles): Skip files with
+	user-controlled locks.
+
 2014-12-10  Richard Earnshaw  <rearnsha@arm.com>
 
 	* sysdeps/aarch64/strchrnul.S (vrepmask): Use a call-clobbered