Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull aio updates from Al Viro:
 "Majority of AIO stuff this cycle. aio-fsync and aio-poll, mostly.

  The only thing I'm holding back for a day or so is Adam's aio ioprio -
  his last-minute fixup is trivial (missing stub in !CONFIG_BLOCK case),
  but let it sit in -next for decency sake..."

* 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
  aio: sanitize the limit checking in io_submit(2)
  aio: fold do_io_submit() into callers
  aio: shift copyin of iocb into io_submit_one()
  aio_read_events_ring(): make a bit more readable
  aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way
  aio: take list removal to (some) callers of aio_complete()
  aio: add missing break for the IOCB_CMD_FDSYNC case
  random: convert to ->poll_mask
  timerfd: convert to ->poll_mask
  eventfd: switch to ->poll_mask
  pipe: convert to ->poll_mask
  crypto: af_alg: convert to ->poll_mask
  net/rxrpc: convert to ->poll_mask
  net/iucv: convert to ->poll_mask
  net/phonet: convert to ->poll_mask
  net/nfc: convert to ->poll_mask
  net/caif: convert to ->poll_mask
  net/bluetooth: convert to ->poll_mask
  net/sctp: convert to ->poll_mask
  net/tipc: convert to ->poll_mask
  ...

diff --cc Documentation/filesystems/Locking
index 15853d5229411e5e06f142d08f71c50776e74f81,6d227f9d7bd933839ce4e880e3949511df0c470f..2c391338c6757f505eac6dfcbe98a169452ad305
--- 1/Documentation/filesystems/Locking
--- 2/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@@ -439,8 -439,9 +439,10 @@@ prototypes
        ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
        ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
        int (*iterate) (struct file *, struct dir_context *);
-       unsigned int (*poll) (struct file *, struct poll_table_struct *);
 +      int (*iterate_shared) (struct file *, struct dir_context *);
+       __poll_t (*poll) (struct file *, struct poll_table_struct *);
+       struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
+       __poll_t (*poll_mask) (struct file *, __poll_t);
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
        int (*mmap) (struct file *, struct vm_area_struct *);

diff --cc drivers/net/ppp/pppoe.c
Simple merge

diff --cc drivers/vhost/vhost.c
Simple merge

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

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc include/net/udp.h
Simple merge

diff --cc net/9p/trans_fd.c
Simple merge

diff --cc net/ax25/af_ax25.c
Simple merge

diff --cc net/bluetooth/af_bluetooth.c
Simple merge

diff --cc net/can/bcm.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/dccp/proto.c
Simple merge

diff --cc net/decnet/af_decnet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/kcm/kcmsock.c
Simple merge

diff --cc net/key/af_key.c
Simple merge

diff --cc net/l2tp/l2tp_ppp.c
Simple merge

diff --cc net/llc/af_llc.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/netrom/af_netrom.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/phonet/socket.c
Simple merge

diff --cc net/rose/af_rose.c
Simple merge

diff --cc net/rxrpc/af_rxrpc.c
Simple merge

diff --cc net/sctp/ipv6.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge