diff --git a/ChangeLog b/ChangeLog
index d18c24453f..f21b5ad6ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-10  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c: Add a comment about
+	a kernel issue which lead to test failure in some cases.
+
 2018-07-10  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #23036]
diff --git a/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c b/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c
index d1d00eb3fb..03c4abfeff 100644
--- a/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c
+++ b/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c
@@ -40,6 +40,14 @@ do_prepare (int argc, char **argv)
 
 #define PREPARE do_prepare
 
+/* Linux between 4.13 and 4.15 return EOVERFLOW for LFS OFD locks usage
+   in compat mode (non-LFS ABI running on a LFS default kernel, such as
+   i386 on a x86_64 kernel or s390-32 on a s390-64 kernel) [1].  This is
+   a kernel issue because __NR_fcntl64 is the expected way to use OFD locks
+   (used on GLIBC for both fcntl and fcntl64).
+
+   [1] https://sourceware.org/ml/libc-alpha/2018-07/msg00243.html  */
+
 static int
 do_test (void)
 {