Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

More iov_iter work for the networking from Al Viro.

Signed-off-by: David S. Miller <davem@davemloft.net>

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

diff --cc include/net/bluetooth/l2cap.h
Simple merge

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

diff --cc net/bluetooth/smp.c
index 96bf16d,de7dc75..6a46252
--- 1/net/bluetooth/smp.c
--- 2/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@@ -2914,10 -1677,9 +2912,9 @@@ static const struct l2cap_ops smp_root_
        .resume                 = l2cap_chan_no_resume,
        .set_shutdown           = l2cap_chan_no_set_shutdown,
        .get_sndtimeo           = l2cap_chan_no_get_sndtimeo,
-       .memcpy_fromiovec       = l2cap_chan_no_memcpy_fromiovec,
  };
  
 -int smp_register(struct hci_dev *hdev)
 +static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)
  {
        struct l2cap_chan *chan;
        struct crypto_blkcipher *tfm_aes;

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

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