summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0050-iov_iter
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-06-03 22:15:07 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-06-16 22:31:24 +0200
commit32825450e77e63dbb3b7343476f39a283ec3da46 (patch)
tree8479bbf6bbc1b9082215602297d94905a71eab91 /patches/collateral-evolutions/network/0050-iov_iter
parent28741a879d4951f688783437e07bed853f087602 (diff)
patches: refresh patches on next-20150612
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.68 [ OK ] 4 3.3.8 [ OK ] 5 3.4.107 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.75 [ OK ] 12 3.11.10 [ OK ] 13 3.12.40 [ OK ] 14 3.13.11 [ OK ] 15 3.14.39 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.12 [ OK ] 20 3.19.5 [ OK ] 21 4.0.0 [ OK ] 22 4.1-rc1 [ FAIL ] Only kernel 4.1-rc1 will fail, because tty_set_termios() is not exported, 4.1-rc4 works. manual changes done to: drivers/media/platform/vim2m.c Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0050-iov_iter')
-rw-r--r--patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
index 724d02ea..39bf0779 100644
--- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
@@ -105,7 +105,7 @@
static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -2120,7 +2120,12 @@ static inline int l2cap_skbuff_fromiovec
+@@ -2116,7 +2116,12 @@ static inline int l2cap_skbuff_fromiovec
struct sk_buff **frag;
int sent = 0;
@@ -118,7 +118,7 @@
return -EFAULT;
sent += count;
-@@ -2140,8 +2145,13 @@ static inline int l2cap_skbuff_fromiovec
+@@ -2136,8 +2141,13 @@ static inline int l2cap_skbuff_fromiovec
*frag = tmp;
@@ -175,7 +175,7 @@
l2cap_chan_send(chan, &msg, 1 + len);
-@@ -3049,6 +3054,9 @@ static const struct l2cap_ops smp_chan_o
+@@ -3047,6 +3052,9 @@ static const struct l2cap_ops smp_chan_o
.suspend = l2cap_chan_no_suspend,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
@@ -185,7 +185,7 @@
};
static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
-@@ -3097,6 +3105,9 @@ static const struct l2cap_ops smp_root_c
+@@ -3095,6 +3103,9 @@ static const struct l2cap_ops smp_root_c
.resume = l2cap_chan_no_resume,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,