This commit is from upstream and is included in the llvm-15 release

commit b379129c4beb3f26223288627a1291739f33af02
Author: Fangrui Song <i@maskray.me>
Date:   Mon Jul 11 11:38:28 2022 -0700

    [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
    
    It is generally not a good idea to mix usage of glibc headers and Linux UAPI
    headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
    since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
    defines `fsconfig_command` which conflicts with linux/mount.h:
    
        .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’
    
    Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually.
    
    Fix https://github.com/llvm/llvm-project/issues/56421
    
    Reviewed By: #sanitizers, vitalybuka, zatrazz
    
    Differential Revision: https://reviews.llvm.org/D129471

diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
index 4bd425435d56..81740bf4ab39 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -73,7 +73,6 @@
 #include <sys/vt.h>
 #include <linux/cdrom.h>
 #include <linux/fd.h>
-#include <linux/fs.h>
 #include <linux/hdreg.h>
 #include <linux/input.h>
 #include <linux/ioctl.h>
@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
 #endif
-  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
-  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
-  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
-  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
+  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
+  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
+  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
+  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
   unsigned IOCTL_GIO_FONT = GIO_FONT;
   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
ackages</a>/<a href='/guix/log/gnu/packages/bash.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>bash.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/bash.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-20 23:23:40 +0100'>2021-12-20</span></td><td><a href='/guix/commit/gnu/packages/bash.scm?id=0a17eee8ebd7847085419028ce6e1f44238cb8f9'>gnu: Add bash-with-syslog.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bash.scm (bash-with-syslog): New variable.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/bash.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-04 22:34:32 +0200'>2021-06-04</span></td><td><a href='/guix/commit/gnu/packages/bash.scm?id=b202fdf1316113298359a0730f9f15d85d238bf3'>gnu: bats: Set #:guile argument of 'wrap-script'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bash.scm
  (bats)[arguments]&lt;#:builder&gt;: Set #:guile argument
  of ‘wrap-script’.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2021-05-09 23:43:31 +0200'>2021-05-09</span></td><td><a href='/guix/commit/gnu/packages/bash.scm?id=4e47b77533878bc8ded887bbe9c4ea7a3e0b03c0'>gnu: bash: Update to 5.1.8.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bash.scm (patch-url): Adjust for 5.1.
(%patch-series-5.0): Rename to ...
(%patch-series-5.1): Add the 5.1 patches.
(bash): Update to 5.1 and and adjust for renamed variable.
* gnu/packages/gawk.scm (gawk)[arguments]: Adjust test that fails with the new
Bash.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-10-26 22:56:29 +0100'>2020-10-26</span></td><td><a href='/guix/commit/gnu/packages/bash.scm?id=0be00efff5d5e138c356464060fc47b7a5c47e28'>gnu: Use prefix "license:" to import (guix licenses)</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bash.scm
(bash, bash-completion, bash-tap, bats, bash-ctypes)[license]:

Rename with prefix "license:".

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Zhu Zihao</td></tr>
<tr><td><span title='2020-10-26 22:56:29 +0100'>2020-10-26</span></td><td><a href='/guix/commit/gnu/packages/bash.scm?id=aa73b41acb81c13a35d0afd272a44abe1a29c708'>gnu: Add bash-ctypes.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bash.scm (bash-ctypes): New variable.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Zhu Zihao</td></tr>