diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-15 16:57:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-15 16:57:37 +0100 |
| commit | 471864ac8a3274106e0bf3a3e2119c282b76c062 (patch) | |
| tree | 70a78630af16e5374ddfe9f5626750bf8bf60a7f /include/uapi/linux | |
| parent | 8e8bc5000328a1ba8f93d43faf427e8ac31fb416 (diff) | |
| parent | 41c25e193b2befc22462aa41591d397fab174ca1 (diff) | |
Merge branch 'for-linus' into for-next
Pull the latest 6.8 stuff into devel branch for further development.
Fixed the trivial merge conflict for HD-audio Realtek stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/btrfs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 7c29d82db9ee..f8bc34a6bcfa 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -614,6 +614,9 @@ struct btrfs_ioctl_clone_range_args { */ #define BTRFS_DEFRAG_RANGE_COMPRESS 1 #define BTRFS_DEFRAG_RANGE_START_IO 2 +#define BTRFS_DEFRAG_RANGE_FLAGS_SUPP (BTRFS_DEFRAG_RANGE_COMPRESS | \ + BTRFS_DEFRAG_RANGE_START_IO) + struct btrfs_ioctl_defrag_range_args { /* start of the defrag operation */ __u64 start; |