Merge branch 'iocb' into for-next

diff --cc arch/s390/hypfs/inode.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_file_ops.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc fs/aio.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ceph/file.c
Simple merge

diff --cc fs/ecryptfs/file.c
Simple merge

diff --cc fs/ext4/indirect.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc fs/nfs/direct.c
Simple merge

diff --cc fs/nfs/file.c
Simple merge

diff --cc fs/ntfs/file.c
Simple merge

diff --cc fs/xfs/xfs_file.c
index a2e1cb8a568bf9d45e32c43539a2e6f8b56d83f4,f527618cb42b8b490d3b3aa2787afab4eb94ab36..f44212fae65327347db1ba9f8ec1739d30650f44
--- 1/fs/xfs/xfs_file.c
--- 2/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@@ -36,9 -36,7 +36,8 @@@
  #include "xfs_trace.h"
  #include "xfs_log.h"
  #include "xfs_icache.h"
 +#include "xfs_pnfs.h"
  
- #include <linux/aio.h>
  #include <linux/dcache.h>
  #include <linux/falloc.h>
  #include <linux/pagevec.h>

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc sound/core/pcm_native.c
Simple merge