diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 11:01:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 11:01:47 +1000 |
| commit | 761ff2be85538fd8ba69bd3967f87ce708aebd6c (patch) | |
| tree | 9a6aa5b4322fb7f6ecb20d5f9fd40dac1b037907 /include/linux | |
| parent | c7ded9ac0254fcd47112c679f0ba0d7502531ceb (diff) | |
| parent | 51921cb746f56983db5a373ca68deb2b0d3ddf01 (diff) | |
Merge remote branch 'fuse/for-next'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fuse.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 3e2925a34bf0..88e0eb596919 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h @@ -34,6 +34,9 @@ * 7.13 * - make max number of background requests and congestion threshold * tunables + * + * 7.14 + * - add splice support to fuse device */ #ifndef _LINUX_FUSE_H @@ -65,7 +68,7 @@ #define FUSE_KERNEL_VERSION 7 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 13 +#define FUSE_KERNEL_MINOR_VERSION 14 /** The node ID of the root inode */ #define FUSE_ROOT_ID 1 |