The only slightly tricky merge conflict was the netdevsim because the mutex locking fix overlapped a lot of driver reload reorganization. The rest were (relatively) trivial in nature.
Showing the changes to include/uapi/linux (1 of 623 files). Show all
Unified · Split
| @@ -38,6 +38,43 @@ · 37 unmodified lines | ||
| 38 | 38 | * |
| 39 | 39 | * Protocol changelog: |
| 40 | 40 | * |
| 41 | + * 7.1: | |
| 42 | + * - add the following messages: | |
| 43 | + * FUSE_SETATTR, FUSE_SYMLINK, FUSE_MKNOD, FUSE_MKDIR, FUSE_UNLINK, | |
| 44 | + * FUSE_RMDIR, FUSE_RENAME, FUSE_LINK, FUSE_OPEN, FUSE_READ, FUSE_WRITE, | |
| 45 | + * FUSE_RELEASE, FUSE_FSYNC, FUSE_FLUSH, FUSE_SETXATTR, FUSE_GETXATTR, | |
| 46 | + * FUSE_LISTXATTR, FUSE_REMOVEXATTR, FUSE_OPENDIR, FUSE_READDIR, | |
| 47 | + * FUSE_RELEASEDIR | |
| 48 | + * - add padding to messages to accommodate 32-bit servers on 64-bit kernels | |
| 49 | + * | |
| 50 | + * 7.2: | |
| 51 | + * - add FOPEN_DIRECT_IO and FOPEN_KEEP_CACHE flags | |
| 52 | + * - add FUSE_FSYNCDIR message | |
| 53 | + * | |
| 54 | + * 7.3: | |
| 55 | + * - add FUSE_ACCESS message | |
| 56 | + * - add FUSE_CREATE message | |
| 57 | + * - add filehandle to fuse_setattr_in | |
| 58 | + * | |
| 59 | + * 7.4: | |
| 60 | + * - add frsize to fuse_kstatfs | |
| 61 | + * - clean up request size limit checking | |
| 62 | + * | |
| 63 | + * 7.5: | |
| 64 | + * - add flags and max_write to fuse_init_out | |
| 65 | + * | |
| 66 | + * 7.6: | |
| 67 | + * - add max_readahead to fuse_init_in and fuse_init_out | |
| 68 | + * | |
| 69 | + * 7.7: | |
| 70 | + * - add FUSE_INTERRUPT message | |
| 71 | + * - add POSIX file lock support | |
| 72 | + * | |
| 73 | + * 7.8: | |
| 74 | + * - add lock_owner and flags fields to fuse_release_in | |
| 75 | + * - add FUSE_BMAP message | |
| 76 | + * - add FUSE_DESTROY message | |
| 77 | + * | |
| 41 | 78 | * 7.9: |
| 42 | 79 | * - new fuse_getattr_in input argument of GETATTR |
| 43 | 80 | * - add lk_flags in fuse_lk_in |