Merge branch 'iocb' into for-davem

Browse source

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>

...

This commit is contained in:

Al Viro 2015-04-09 00:00:30 -04:00

parent 7abccdba25 e2e40f2c1e

commit 237dae8890

69 changed files with 199 additions and 266 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

70

include/linux/aio.h

View file

22

include/linux/fs.h

View file

1

include/net/sock.h

View file