diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-27 14:41:01 -0700 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-27 14:46:19 -0700 |
commit | 2d344a9aa00ede8cfa408626e6fd5540ed2b11fa (patch) | |
tree | a0763bbe587d268652c00edc984bff697ead8b26 /patches/collateral-evolutions | |
parent | b9aeaa7676bf67d06172c7db40b62d1cfc702933 (diff) |
backports: refresh patches for next-20130802 again
For some reason some other changes were picked up again now.
== ckmake-report.log ==
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.79 [ OK ]
17 3.1.10 [ OK ]
18 3.10-rc1 [ OK ]
19 3.2.45 [ OK ]
20 3.3.8 [ OK ]
21 3.4.46 [ OK ]
22 3.5.7 [ OK ]
23 3.6.11 [ OK ]
24 3.7.10 [ OK ]
25 3.8.13 [ OK ]
26 3.9.3 [ OK ]
real 34m47.737s
user 937m23.708s
sys 129m50.928s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions')
5 files changed, 8 insertions, 8 deletions
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch index 0b321465..318cc342 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c -@@ -1403,6 +1403,9 @@ static int alx_resume(struct device *dev +@@ -1401,6 +1401,9 @@ static int alx_resume(struct device *dev return __alx_open(alx, true); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume); #define ALX_PM_OPS (&alx_pm_ops) #else -@@ -1505,7 +1508,12 @@ static struct pci_driver alx_driver = { +@@ -1503,7 +1506,12 @@ static struct pci_driver alx_driver = { .probe = alx_probe, .remove = alx_remove, .err_handler = &alx_err_handlers, diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch index b4f7b1d5..e78767e5 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch @@ -12,7 +12,7 @@ &bt_link_group, NULL }; -@@ -378,7 +386,11 @@ static struct attribute_group bt_host_gr +@@ -378,7 +382,11 @@ static struct attribute_group bt_host_gr .attrs = bt_host_attrs, }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch index dac5ace5..52e49455 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct +@@ -809,7 +809,11 @@ static int rfcomm_tty_write_room(struct return room; } @@ -12,7 +12,7 @@ { BT_DBG("tty %p cmd 0x%02x", tty, cmd); -@@ -1068,7 +1080,11 @@ static void rfcomm_tty_hangup(struct tty +@@ -1068,7 +1072,11 @@ static void rfcomm_tty_hangup(struct tty } } @@ -24,7 +24,7 @@ { struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; -@@ -1077,7 +1093,11 @@ static int rfcomm_tty_tiocmget(struct tt +@@ -1077,7 +1085,11 @@ static int rfcomm_tty_tiocmget(struct tt return dev->modem_status; } diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch index dbc4d509..742ae0fb 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch @@ -44,7 +44,7 @@ #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = alx_poll_controller, #endif -@@ -1305,7 +1319,11 @@ static int alx_probe(struct pci_dev *pde +@@ -1303,7 +1317,11 @@ static int alx_probe(struct pci_dev *pde } } diff --git a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch index f9a6c835..cfc21d55 100644 --- a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch +++ b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -868,7 +868,11 @@ static int rfcomm_tty_ioctl(struct tty_s +@@ -860,7 +860,11 @@ static int rfcomm_tty_ioctl(struct tty_s static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) { |