--- a/ChangeLog	Sun Jun 24 02:09:12 2018 -0700
+++ b/ChangeLog	Sun Jun 24 23:38:32 2018 +0200
@@ -1,3 +1,34 @@
+2018-06-24  Pádraig Brady  <P@draigBrady.com>
+
+	af_alg: disable kernel hash functions by default
+	All the kernel routines were seen to be significantly slower
+	with these relatively recent components on an i3-2310M system:
+	  kernel-4.10.6-200.fc25.x86_64
+	  openssl-1.0.2m-1.fc25.x86_64
+	sha1 was nearly twice as slow in the kernel for example.
+	Further considerations why this should not be the default, at:
+	https://lists.gnu.org/r/coreutils/2018-06/msg00034.html
+
+	* m4/af_alg.m4: Require --with-linux-crypto to enable.
+	* m4/gl-openssl.m4: Tweak accordingly.
+
+2018-06-24  Pádraig Brady  <P@draigBrady.com>
+
+	af_alg: avoid hangs when reading from streams
+	* lib/af_alg.c (afalg_stream): Don't assume EOF is sticky,
+	and thus avoid doing a fread() when feof() is set.
+	* lib/md5.c: Ensure feof() is called before fread().
+	* lib/sha1.c: Likewise.
+	* lib/sha256.c: Likewise.
+	* lib/sha512.c: Likewise.
+
+2018-06-24  Pádraig Brady  <P@draigBrady.com>
+
+	af_alg: fix error handling when hash not returned
+	* lib/af_alg.c (afalg_stream): Handle the case where we've
+	successfully written data to the kernel in the read/write loop,
+	but the kernel doesn't respond with the hash.
+
 2018-06-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	libc-config: merge from glibc
@@ -32,37 +63,6 @@
 	* tests/test-wcwidth.c (main): If the wchar-single module is present,
 	skip the tests in the C locale.
 
-2018-06-24  Pádraig Brady  <P@draigBrady.com>
-
-	af_alg: disable kernel hash functions by default
-	All the kernel routines were seen to be significantly slower
-	with these relatively recent components on an i3-2310M system:
-	  kernel-4.10.6-200.fc25.x86_64
-	  openssl-1.0.2m-1.fc25.x86_64
-	sha1 was nearly twice as slow in the kernel for example.
-	Further considerations why this should not be the default, at:
-	https://lists.gnu.org/r/coreutils/2018-06/msg00034.html
-
-	* m4/af_alg.m4: Require --with-linux-crypto to enable.
-	* m4/gl-openssl.m4: Tweak accordingly.
-
-2018-06-24  Pádraig Brady  <P@draigBrady.com>
-
-	af_alg: avoid hangs when reading from streams
-	* lib/af_alg.c (afalg_stream): Don't assume EOF is sticky,
-	and thus avoid doing a fread() when feof() is set.
-	* lib/md5.c: Ensure feof() is called before fread().
-	* lib/sha1.c: Likewise.
-	* lib/sha256.c: Likewise.
-	* lib/sha512.c: Likewise.
-
-2018-06-24  Pádraig Brady  <P@draigBrady.com>
-
-	af_alg: fix error handling when hash not returned
-	* lib/af_alg.c (afalg_stream): Handle the case where we've
-	successfully written data to the kernel in the read/write loop,
-	but the kernel doesn't respond with the hash.
-
 2018-06-23  Pádraig Brady  <P@draigBrady.com>
 
 	crypto: mention --without-linux-crypto in --with-openssl --help