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 /include/net | |
| parent | 7abccdba25be45630eede85053496f1f48d36ec8 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
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 'include/net')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index bd6f523f2251..3a4898ec8c67 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | #include <linux/page_counter.h> | 57 | #include <linux/page_counter.h> |
| 58 | #include <linux/memcontrol.h> | 58 | #include <linux/memcontrol.h> |
| 59 | #include <linux/static_key.h> | 59 | #include <linux/static_key.h> |
| 60 | #include <linux/aio.h> | ||
| 61 | #include <linux/sched.h> | 60 | #include <linux/sched.h> |
| 62 | 61 | ||
| 63 | #include <linux/filter.h> | 62 | #include <linux/filter.h> |