Merge branch 'iocb' into for-davem
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 9 Apr 2015 04:00:30 +0000 (00:00 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 9 Apr 2015 04:01:38 +0000 (00:01 -0400)
commit237dae889051ed4ebf438b08ca6c0e7c54b97774
tree0cbd9882d28f19875f5c1daf1698edaac985de0f
parent7abccdba25be45630eede85053496f1f48d36ec8
parente2e40f2c1ed433c5e224525c8c862fd32e5d3df2
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>
24 files changed:
arch/s390/hypfs/inode.c
crypto/algif_skcipher.c
drivers/infiniband/hw/qib/qib_file_ops.c
drivers/scsi/sg.c
fs/affs/file.c
fs/aio.c
fs/btrfs/file.c
fs/btrfs/inode.c
fs/ceph/file.c
fs/ecryptfs/file.c
fs/ext4/indirect.c
fs/ext4/inode.c
fs/fuse/dev.c
fs/nfs/direct.c
fs/nfs/file.c
fs/xfs/xfs_file.c
include/linux/fs.h
include/net/sock.h
kernel/printk/printk.c
kernel/sysctl.c
mm/shmem.c
net/ipv4/raw.c
net/socket.c
sound/core/pcm_native.c