diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 16:37:14 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 16:37:14 +0100 |
| commit | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (patch) | |
| tree | bc4b414c7eca762c0bac1176bd1d63b74c9f965e /fs | |
| parent | cgroup: remove cgroup_root_mutex (diff) | |
| parent | cgroup: fix locking in cgroup_cfts_commit() (diff) | |
| download | linux-1a698a4aba26dd58e8409d325a9a9db22f7cd2db.tar.xz linux-1a698a4aba26dd58e8409d325a9a9db22f7cd2db.zip | |
Merge branch 'for-3.14-fixes' into for-3.15
Pending kernfs conversion depends on fixes in for-3.14-fixes. Pull it
into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs3proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index aa9bc973f36a..a462ef0fb5d6 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -18,6 +18,7 @@ #include <linux/lockd/bind.h> #include <linux/nfs_mount.h> #include <linux/freezer.h> +#include <linux/xattr.h> #include "iostat.h" #include "internal.h" |