From: David S. Miller <davem@davemloft.net>
Date: Wed, 10 Dec 2014 18:17:23 +0000 (-0500)
Subject: Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e5f59aacbf9527dfe425541c78cb8c56623e7eb;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

More iov_iter work for the networking from Al Viro.

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

6e5f59aacbf9527dfe425541c78cb8c56623e7eb
diff --cc net/bluetooth/smp.c
index 96bf16dcd9e9,de7dc7581ff0..6a46252fe66f
--- a/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;