diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-22 10:58:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-22 10:58:02 +0300 |
| commit | f85142af36415cdd5be59eb4b00a231c8b6dcb49 (patch) | |
| tree | e8cfcd3cab515f9c11775eefc1371cef2b88c81d /include/uapi/linux | |
| parent | e00943e916782ae17ca05d654779a84f09481ab8 (diff) | |
| parent | 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b (diff) | |
| download | linux-f85142af36415cdd5be59eb4b00a231c8b6dcb49.tar.xz | |
Merge 5.12-rc4 into usb-next
We need the usb/thunderbolt fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/fuse.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 98ca64d1beb6..54442612c48b 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -903,7 +903,8 @@ struct fuse_notify_retrieve_in { }; /* Device ioctls: */ -#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t) +#define FUSE_DEV_IOC_MAGIC 229 +#define FUSE_DEV_IOC_CLONE _IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t) struct fuse_lseek_in { uint64_t fh; |