summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-29 00:53:53 -0700
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-29 00:53:53 -0700
commitf001c70192f5c3434ce9649596961041325a0074 (patch)
tree9a4b32eb81fb860ae3e3b92f2507564dedef05be
parenta029928078ce7708c4cd54a6b9f1fc0212fc3395 (diff)
backports: refresh patches for next-20130528backports-20130528
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] real 33m11.072s user 877m52.824s sys 139m8.874s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch2
-rw-r--r--patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch10
2 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
index 091a8052..c81c6027 100644
--- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
+++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
@@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -4045,9 +4045,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -4042,9 +4042,14 @@ i915_gem_init_hw(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private;
int ret;
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch
index c1d11c37..e18755ab 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
-@@ -2654,15 +2654,21 @@ struct mwl8k_cmd_mac_multicast_adr {
+@@ -2661,15 +2661,21 @@ struct mwl8k_cmd_mac_multicast_adr {
static struct mwl8k_cmd_pkt *
__mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
@@ -22,7 +22,7 @@
if (allmulti || mc_count > priv->num_mcaddrs) {
allmulti = 1;
-@@ -2683,13 +2689,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
+@@ -2690,13 +2696,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
if (allmulti) {
cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST);
} else if (mc_count) {
@@ -50,7 +50,7 @@
}
}
-@@ -5024,7 +5044,11 @@ mwl8k_bss_info_changed(struct ieee80211_
+@@ -5031,7 +5051,11 @@ mwl8k_bss_info_changed(struct ieee80211_
}
static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
@@ -62,7 +62,7 @@
{
struct mwl8k_cmd_pkt *cmd;
-@@ -5035,7 +5059,11 @@ static u64 mwl8k_prepare_multicast(struc
+@@ -5042,7 +5066,11 @@ static u64 mwl8k_prepare_multicast(struc
* we'll end up throwing this packet away and creating a new
* one in mwl8k_configure_filter().
*/
@@ -74,7 +74,7 @@
return (unsigned long)cmd;
}
-@@ -5157,7 +5185,11 @@ static void mwl8k_configure_filter(struc
+@@ -5164,7 +5192,11 @@ static void mwl8k_configure_filter(struc
*/
if (*total_flags & FIF_ALLMULTI) {
kfree(cmd);