Merge 5.12-rc4 into usb-next

We need the usb/thunderbolt fixes in here as well.

Greg Kroah-Hartman committed 5 years ago

Commit f85142a2 parents e00943e 0d02ec6412 files · +2472 −1804Browse files

Showing the changes to include/uapi (1 of 412 files). Show all

Unified · Split

@@ -903,7 +903,8 @@ struct fuse_notify_retrieve_in { · 902 unmodified lines
903	903	};
904	904
905	905	/* Device ioctls: */
906		−#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t)
	906	+#define FUSE_DEV_IOC_MAGIC 229
	907	+#define FUSE_DEV_IOC_CLONE _IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
907	908
908	909	struct fuse_lseek_in {
909	910	uint64_t fh;