Description of problem:
When I built latest upstream xfsprogs(HEAD=28bbc15a60d7ffb5fc9e28bbc16c67916a831ece) on RHEL-8, I got below error:

Building io
    [CC]     stat.o
In file included from /usr/include/sys/stat.h:446,
                 from ../include/xfs/linux.h:13,
                 from ../include/xfs.h:9,
                 from ../include/project.h:10,
                 from ../include/input.h:12,
                 from stat.c:13:
/usr/include/bits/statx.h:25:8: error: redefinition of ‘struct statx_timestamp’
 struct statx_timestamp
        ^~~~~~~~~~~~~~~
In file included from stat.c:10:
/usr/include/linux/stat.h:56:8: note: originally defined here
 struct statx_timestamp {
        ^~~~~~~~~~~~~~~
In file included from /usr/include/sys/stat.h:446,
                 from ../include/xfs/linux.h:13,
                 from ../include/xfs.h:9,
                 from ../include/project.h:10,
                 from ../include/input.h:12,
                 from stat.c:13:
/usr/include/bits/statx.h:36:8: error: redefinition of ‘struct statx’
 struct statx
        ^~~~~
In file included from stat.c:10:
/usr/include/linux/stat.h:99:8: note: originally defined here
 struct statx {
        ^~~~~
gmake[2]: *** [../include/buildrules:81: stat.o] Error 1
gmake[1]: *** [include/buildrules:36: io] Error 2
make: *** [Makefile:92: default] Error 2

Version-Release number of selected component (if applicable):
glibc-headers-2.28-42.el8.x86_64
kernel-headers-4.18.0-80.el8.x86_64

How reproducible:
100%

Steps to Reproduce:
# git clone git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git
# git checkout -b for-next origin/for-next
# make

Actual results:
As above

Expected results:


Additional info:
A trick[1] as below can avoid this issue. But bits/statx.h already metioned[2] the kernel may add additional fields to struct statx in the future. So I suppose glibc might already has a proper strategy to deal with this conflict.

[1]
--- /usr/include/bits/statx.h.old       2019-04-12 00:16:43.028623409 -0400
+++ /usr/include/bits/statx.h   2019-04-12 00:09:12.318449804 -0400
@@ -20,7 +20,6 @@
 
 #ifndef _SYS_STAT_H
 # error Never include <bits/stat.x.h> directly, include <sys/stat.h> instead.
-#endif
 
 struct statx_timestamp
 {
@@ -81,6 +80,8 @@ struct statx
 #define STATX_ATTR_ENCRYPTED 0x0800
 #define STATX_ATTR_AUTOMOUNT 0x1000
 
+#endif
+
 __BEGIN_DECLS
 
 /* Fill *BUF with information about PATH in DIRFD.  */


[2]
/* Warning: The kernel may add additional fields to this struct in the
   future.  Only use this struct for calling the statx function, not
   for storing data.  (Expansion will be controlled by the mask
   argument of the statx function.)  */