diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:00:30 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:01:38 -0400 |
commit | 237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch) | |
tree | 0cbd9882d28f19875f5c1daf1698edaac985de0f /fs/jfs/inode.c | |
parent | 7abccdba25be45630eede85053496f1f48d36ec8 (diff) | |
parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
download | linux-237dae889051ed4ebf438b08ca6c0e7c54b97774.tar.bz2 |
Merge branch 'iocb' into for-davem
trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jfs/inode.c')
-rw-r--r-- | fs/jfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index bd3df1ca3c9b..3197aed10614 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -22,8 +22,8 @@ #include <linux/buffer_head.h> #include <linux/pagemap.h> #include <linux/quotaops.h> +#include <linux/uio.h> #include <linux/writeback.h> -#include <linux/aio.h> #include "jfs_incore.h" #include "jfs_inode.h" #include "jfs_filsys.h" |