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/afs/write.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/afs/write.c')
| -rw-r--r-- | fs/afs/write.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index c13cb08964ed..0714abcd7f32 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -14,7 +14,6 @@ #include <linux/pagemap.h> #include <linux/writeback.h> #include <linux/pagevec.h> -#include <linux/aio.h> #include "internal.h" static int afs_write_back_from_locked_page(struct afs_writeback *wb, |