Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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:David S. Miller <davem@davemloft.net>
Showing
- arch/s390/hypfs/inode.c 1 addition, 1 deletionarch/s390/hypfs/inode.c
- crypto/algif_hash.c 2 additions, 2 deletionscrypto/algif_hash.c
- crypto/algif_skcipher.c 3 additions, 3 deletionscrypto/algif_skcipher.c
- drivers/char/mem.c 1 addition, 1 deletiondrivers/char/mem.c
- drivers/char/tile-srom.c 0 additions, 1 deletiondrivers/char/tile-srom.c
- drivers/infiniband/hw/ipath/ipath_file_ops.c 0 additions, 1 deletiondrivers/infiniband/hw/ipath/ipath_file_ops.c
- drivers/infiniband/hw/qib/qib_file_ops.c 0 additions, 1 deletiondrivers/infiniband/hw/qib/qib_file_ops.c
- drivers/misc/mei/amthif.c 0 additions, 1 deletiondrivers/misc/mei/amthif.c
- drivers/misc/mei/main.c 0 additions, 1 deletiondrivers/misc/mei/main.c
- drivers/misc/mei/pci-me.c 0 additions, 1 deletiondrivers/misc/mei/pci-me.c
- drivers/scsi/sg.c 1 addition, 1 deletiondrivers/scsi/sg.c
- drivers/staging/unisys/include/timskmod.h 0 additions, 1 deletiondrivers/staging/unisys/include/timskmod.h
- drivers/usb/gadget/function/f_fs.c 4 additions, 2 deletionsdrivers/usb/gadget/function/f_fs.c
- drivers/usb/gadget/legacy/inode.c 4 additions, 2 deletionsdrivers/usb/gadget/legacy/inode.c
- drivers/vhost/net.c 2 additions, 2 deletionsdrivers/vhost/net.c
- fs/9p/vfs_addr.c 1 addition, 1 deletionfs/9p/vfs_addr.c
- fs/affs/file.c 1 addition, 1 deletionfs/affs/file.c
- fs/afs/misc.c 15 additions, 1 deletionfs/afs/misc.c
- fs/afs/rxrpc.c 1 addition, 4 deletionsfs/afs/rxrpc.c
- fs/afs/write.c 0 additions, 1 deletionfs/afs/write.c
Loading
Please register or sign in to comment