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 /net/ipv4 | |
| 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 'net/ipv4')
| -rw-r--r-- | net/ipv4/raw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 6d0fa8fb8af0..f2fc92a1241a 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <linux/stddef.h> | 46 | #include <linux/stddef.h> |
| 47 | #include <linux/slab.h> | 47 | #include <linux/slab.h> |
| 48 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 49 | #include <linux/aio.h> | ||
| 50 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
| 51 | #include <linux/export.h> | 50 | #include <linux/export.h> |
| 52 | #include <linux/spinlock.h> | 51 | #include <linux/spinlock.h> |