1. 14 Apr, 2015 39 commits
  2. 13 Apr, 2015 1 commit
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 6e8a9d91
      David S. Miller authored
      Al Viro says:
      
      ====================
      netdev-related stuff in vfs.git
      
      There are several commits sitting in vfs.git that probably ought to go in
      via net-next.git.  First of all, there's merge with vfs.git#iocb - that's
      Christoph's aio rework, which has triggered conflicts with the ->sendmsg()
      and ->recvmsg() patches a while ago.  It's not so much Christoph's stuff
      that ought to be in net-next, as (pretty simple) conflict resolution on merge.
      The next chunk is switch to {compat_,}import_iovec/import_single_range - new
      safer primitives for initializing iov_iter.  The primitives themselves come
      from vfs/git#iov_iter (and they are used quite a lot in vfs part of queue),
      conversion of net/socket.c syscalls belongs in net-next, IMO.  Next there's
      afs and rxrpc stuff from dhowells.  And then there's sanitizing kernel_sendmsg
      et.al.  + missing inlined helper for "how much data is left in msg->msg_iter" -
      this stuff is used in e.g.  cifs stuff, but it belongs in net-next.
      
      That pile is pullable from
      git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-davem
      
      I'll post the individual patches in there in followups; could you take a look
      and tell if everything in there is OK with you?
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e8a9d91