From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from server19320154104.serverpool.info ([193.201.54.104]:57469 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755987Ab3KMQWe (ORCPT ); Wed, 13 Nov 2013 11:22:34 -0500 From: Hauke Mehrtens To: mcgrof@gmail.com Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 3.11] backports: refresh patches on v3.11.8 Date: Wed, 13 Nov 2013 17:22:08 +0100 Message-Id: <1384359728-4890-1-git-send-email-hauke@hauke-m.de> (sfid-20131113_172237_741675_2FA1A722) Sender: backports-owner@vger.kernel.org List-ID: == 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.101 [ OK ] 17 3.1.10 [ OK ] 18 3.10.17 [ OK ] 19 3.11.6 [ OK ] 20 3.12-rc7 [ FAIL ] 21 3.2.52 [ OK ] 22 3.3.8 [ OK ] 23 3.4.67 [ OK ] 24 3.5.7 [ OK ] 25 3.6.11 [ OK ] 26 3.7.10 [ OK ] 27 3.8.13 [ OK ] 28 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens --- .../collateral-evolutions/network/0001-netdev_ops/mwifiex.patch | 2 +- .../11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch | 4 ++-- .../network/12-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 ++-- .../network/22-multiqueue/net_mac80211_tx.patch | 2 +- .../network/25-multicast-list_head/net_mac80211_ieee80211_i.patch | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch index 5a48c9d..1965359 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -741,7 +741,7 @@ static const struct net_device_ops mwifi +@@ -743,7 +743,7 @@ static const struct net_device_ops mwifi void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch index 8d83bbe..c3446a4 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -398,6 +398,9 @@ static int iwl_pci_resume(struct device +@@ -408,6 +408,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -413,7 +416,12 @@ static struct pci_driver iwl_pci_driver +@@ -423,7 +426,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch index e8339e7..c638cd5 100644 --- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1972,6 +1972,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1973,6 +1973,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail_rcu; } @@ -8,7 +8,7 @@ if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2000,6 +2001,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2001,6 +2002,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch index 8ff53fc..749100b 100644 --- a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1455,6 +1455,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1456,6 +1456,10 @@ void ieee80211_xmit(struct ieee80211_sub } } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch index 40c37f1..5ad9106 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -926,7 +926,12 @@ struct ieee80211_local { +@@ -929,7 +929,12 @@ struct ieee80211_local { struct work_struct reconfig_filter; /* aggregated multicast list */ -- 1.7.10.4