linux/net/socket.c, branch v4.1

VFS: net/: d_inode() annotations

2015-04-15T19:06:56Z

socket inodes and sunrpc filesystems - inodes owned by that code Signed-off-by: David Howells Signed-off-by: Al Viro

make new_sync_{read,write}() static

2015-04-12T02:29:40Z

All places outside of core VFS that checked ->read and ->write for being NULL or called the methods directly are gone now, so NULL {read,write} with non-NULL {read,write}_iter will do the right thing in all cases. Signed-off-by: Al Viro

new helper: msg_data_left()

2015-04-11T19:53:35Z

convert open-coded instances Signed-off-by: Al Viro

get rid of the size argument of sock_sendmsg()

2015-04-11T19:27:37Z

it's equal to iov_iter_count(&msg->msg_iter) in all cases Signed-off-by: Al Viro

switch kernel_sendmsg() and kernel_recvmsg() to iov_iter_kvec()

2015-04-09T04:02:34Z

For kernel_sendmsg() that eliminates the need to play with setfs(); for kernel_recvmsg() it does *not* - a couple of callers are using it with non-NULL ->msg_control, which would be treated as userland address on recvmsg side of things. In all cases we are really setting a kvec-backed iov_iter, though. Signed-off-by: Al Viro

net: switch importing msghdr from userland to {compat_,}import_iovec()

2015-04-09T04:02:26Z

Signed-off-by: Al Viro

net: switch sendto() and recvfrom() to import_single_range()

2015-04-09T04:02:21Z

Signed-off-by: Al Viro

Merge branch 'iocb' into for-davem

2015-04-09T04:01:38Z

trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro

net: socket: add support for async operations

2015-03-23T20:41:36Z

Add support for async operations. Signed-off-by: Tadeusz Struk Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-03-20T22:51:09Z

Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller