Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes.
Showing the changes to include/uapi (1 of 154 files). Show all
Unified · Split
| @@ -105,6 +105,9 @@ · 104 unmodified lines | |||
| 105 | * | 105 | * |
| 106 | * 7.24 | 106 | * 7.24 |
| 107 | * - add FUSE_LSEEK for SEEK_HOLE and SEEK_DATA support | 107 | * - add FUSE_LSEEK for SEEK_HOLE and SEEK_DATA support |
| 108 | * | ||
| 109 | * 7.25 | ||
| 110 | * - add FUSE_PARALLEL_DIROPS | ||
| 108 | */ | 111 | */ |
| 109 | 112 | ||
| 110 | #ifndef _LINUX_FUSE_H | 113 | #ifndef _LINUX_FUSE_H |
| @@ -140,7 +143,7 @@ · 29 unmodified lines | |||
| 140 | #define FUSE_KERNEL_VERSION 7 | 143 | #define FUSE_KERNEL_VERSION 7 |
| 141 | 144 | ||
| 142 | /** Minor version number of this interface */ | 145 | /** Minor version number of this interface */ |
| 143 | #define FUSE_KERNEL_MINOR_VERSION 24 | 146 | #define FUSE_KERNEL_MINOR_VERSION 25 |
| 144 | 147 | ||
| 145 | /** The node ID of the root inode */ | 148 | /** The node ID of the root inode */ |
| 146 | #define FUSE_ROOT_ID 1 | 149 | #define FUSE_ROOT_ID 1 |
| @@ -234,6 +237,7 @@ struct fuse_file_lock { · 87 unmodified lines | |||
| 234 | * FUSE_ASYNC_DIO: asynchronous direct I/O submission | 237 | * FUSE_ASYNC_DIO: asynchronous direct I/O submission |
| 235 | * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes | 238 | * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes |
| 236 | * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens | 239 | * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens |
| 240 | * FUSE_PARALLEL_DIROPS: allow parallel lookups and readdir | ||
| 237 | */ | 241 | */ |
| 238 | #define FUSE_ASYNC_READ (1 << 0) | 242 | #define FUSE_ASYNC_READ (1 << 0) |
| 239 | #define FUSE_POSIX_LOCKS (1 << 1) | 243 | #define FUSE_POSIX_LOCKS (1 << 1) |
| @@ -253,6 +257,7 @@ struct fuse_file_lock { · 13 unmodified lines | |||
| 253 | #define FUSE_ASYNC_DIO (1 << 15) | 257 | #define FUSE_ASYNC_DIO (1 << 15) |
| 254 | #define FUSE_WRITEBACK_CACHE (1 << 16) | 258 | #define FUSE_WRITEBACK_CACHE (1 << 16) |
| 255 | #define FUSE_NO_OPEN_SUPPORT (1 << 17) | 259 | #define FUSE_NO_OPEN_SUPPORT (1 << 17) |
| 260 | #define FUSE_PARALLEL_DIROPS (1 << 18) | ||
| 256 | 261 | ||
| 257 | /** | 262 | /** |
| 258 | * CUSE INIT request/reply flags | 263 | * CUSE INIT request/reply flags |