remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh backmerge of drm-next to pull it in.
Showing the changes to include/uapi/linux (2 of 12204 files). Show all
Unified · Split
| @@ -1,3 +1,4 @@ | ||
| 1 | +# SPDX-License-Identifier: GPL-2.0 | |
| 1 | 2 | ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),) |
| 2 | 3 | no-export-headers += a.out.h |
| 3 | 4 | endif |
| @@ -130,6 +130,9 @@ · 129 unmodified lines | ||
| 130 | 130 | * 7.30 |
| 131 | 131 | * - add FUSE_EXPLICIT_INVAL_DATA |
| 132 | 132 | * - add FUSE_IOCTL_COMPAT_X32 |
| 133 | + * | |
| 134 | + * 7.31 | |
| 135 | + * - add FUSE_WRITE_KILL_PRIV flag | |
| 133 | 136 | */ |
| 134 | 137 | |
| 135 | 138 | #ifndef _LINUX_FUSE_H |
| @@ -165,7 +168,7 @@ · 29 unmodified lines | ||
| 165 | 168 | #define FUSE_KERNEL_VERSION 7 |
| 166 | 169 | |
| 167 | 170 | /** Minor version number of this interface */ |
| 168 | −#define FUSE_KERNEL_MINOR_VERSION 30 | |
| 171 | +#define FUSE_KERNEL_MINOR_VERSION 31 | |
| 169 | 172 | |
| 170 | 173 | /** The node ID of the root inode */ |
| 171 | 174 | #define FUSE_ROOT_ID 1 |
| @@ -327,9 +330,11 @@ struct fuse_file_lock { · 155 unmodified lines | ||
| 327 | 330 | * |
| 328 | 331 | * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed |
| 329 | 332 | * FUSE_WRITE_LOCKOWNER: lock_owner field is valid |
| 333 | + * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits | |
| 330 | 334 | */ |
| 331 | 335 | #define FUSE_WRITE_CACHE (1 << 0) |
| 332 | 336 | #define FUSE_WRITE_LOCKOWNER (1 << 1) |
| 337 | +#define FUSE_WRITE_KILL_PRIV (1 << 2) | |
| 333 | 338 | |
| 334 | 339 | /** |
| 335 | 340 | * Read flags |