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/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
index 4bd425435d56..81740bf4ab39 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -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;
62f692cbf74652'>ci.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/services/ci.scm?id=e775f704c8da973ca42f7f0fe962f692cbf74652&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-28 11:02:56 -0500'>2023-12-28</span></td><td><a href='/guix/commit/gnu/services/ci.scm?id=7722da6fa5422c4fec69d6c8b9536c7d6fc3d326'>services: laminar: Add configuration option for supplementary groups.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/ci (&lt;laminar-configuration&gt;)[supplemental-groups]: New field.
(laminar-shepherd-service): Exec laminard with supplementary groups.
(laminar-account): Add supplementary groups to laminar user.
* doc/guix.texi (Laminar): Document new configuration field.

Change-Id: Iebfdbb58ea8c6dfa22bb8f64f6463e3ad133d2f9
</span></span></td><td>David Thompson</td></tr>
<tr><td><span title='2022-01-11 11:47:42 +0530'>2022-01-11</span></td><td><a href='/guix/commit/gnu/services/ci.scm?id=c1f8dffa549edc0873c8b6956d9b288b51bea521'>services: laminar: Set LAMINAR_BIND_RPC environment variable.</a><span class='msg-avail'>...<span class='msg-tooltip'>Earlier, the bind-rpc field of &lt;laminar-configuration&gt; was not used at
all. This was a bug.

* gnu/services/ci.scm (laminar-shepherd-service): Use bind-rpc to set
LAMINAR_BIND_RPC environment variable.
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2021-06-10 09:58:20 +0530'>2021-06-10</span></td><td><a href='/guix/commit/gnu/services/ci.scm?id=0d2cbd663214a8aa4ed8b8c7716fe3436801a9a5'>services: laminar: Create parent directory for unix socket.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/ci.scm (laminar-activation): New function.
(laminar-service-type): Extend activation-service-type with
laminar-activation.
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2021-04-09 11:59:58 +0100'>2021-04-09</span></td><td><a href='/guix/commit/gnu/services/ci.scm?id=eda4bb4f16f74436b0caf1c584888c89b3c4c69b'>services: Add Laminar.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/ci.scm: New file.
* gnu/tests/ci.scm: New file.
* doc/guix.texi (Laminar): Document the Laminar service.
</span></span></td><td>Christopher Baines</td></tr>