diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2026-02-15 00:06:51 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2026-02-15 00:06:51 +0300 |
| commit | 273a171dee33cb77070d7259c469d9440548c7df (patch) | |
| tree | d82dffe3e4affbce24e05db216d9450743aae625 /samples | |
| parent | 19a5d9ba6208e9006a2a9d5962aea4d6e427d8ab (diff) | |
| parent | ab2e361ca97a42b7af8be1d273646b30d3b75bf3 (diff) | |
| download | linux-273a171dee33cb77070d7259c469d9440548c7df.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 7.0 merge window.
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/vfs/test-statx.c | 6 | ||||
| -rw-r--r-- | samples/watch_queue/watch_test.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/samples/vfs/test-statx.c b/samples/vfs/test-statx.c index 49c7a46cee07..424a6fa15723 100644 --- a/samples/vfs/test-statx.c +++ b/samples/vfs/test-statx.c @@ -19,6 +19,12 @@ #include <time.h> #include <sys/syscall.h> #include <sys/types.h> + +// Work around glibc header silliness +#undef AT_RENAME_NOREPLACE +#undef AT_RENAME_EXCHANGE +#undef AT_RENAME_WHITEOUT + #include <linux/stat.h> #include <linux/fcntl.h> #define statx foo diff --git a/samples/watch_queue/watch_test.c b/samples/watch_queue/watch_test.c index 8c6cb57d5cfc..24cf7d7a1972 100644 --- a/samples/watch_queue/watch_test.c +++ b/samples/watch_queue/watch_test.c @@ -16,6 +16,12 @@ #include <errno.h> #include <sys/ioctl.h> #include <limits.h> + +// Work around glibc header silliness +#undef AT_RENAME_NOREPLACE +#undef AT_RENAME_EXCHANGE +#undef AT_RENAME_WHITEOUT + #include <linux/watch_queue.h> #include <linux/unistd.h> #include <linux/keyctl.h> |