summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-04 21:59:04 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-06 14:05:51 +0100
commitfe0227cd8178f4ec8e6f4c2cef3eea3508763f99 (patch)
tree6212ff4e3cd3ad184de01d0b9bc00abe20365aa7
parentc1fb47e8638fd23ccdaa77781f92f2a1d8e14aff (diff)
patches: refresh on next-20151203backports-20151203
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.74 [ OK ] 4 3.3.8 [ OK ] 5 3.4.110 [ 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.93 [ OK ] 12 3.11.10 [ OK ] 13 3.12.51 [ OK ] 14 3.13.11 [ OK ] 15 3.14.57 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.24 [ OK ] 20 3.19.8 [ OK ] 21 4.0.9 [ OK ] 22 4.1.13 [ OK ] 23 4.2.6 [ OK ] 24 4.3.0 [ OK ] 25 4.4-rc3 [ FAIL ] Build on kernel 4.4-rc3 failed because of a bug introduces in kernel 4.4 in this commit: aabc92bbe3cfe4c "net: add __netdev_alloc_pcpu_stats() to indicate gfp flags" Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch2
-rw-r--r--patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch2
-rw-r--r--patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch2
-rw-r--r--patches/collateral-evolutions/network/0028-select_queue/mac80211.patch4
-rw-r--r--patches/collateral-evolutions/network/0053-possible_net_t.patch2
5 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
index a2161ffe..5bc2906d 100644
--- a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
+++ b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
@@ -1,6 +1,6 @@
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -3179,6 +3179,9 @@ struct wiphy_vendor_command {
+@@ -3182,6 +3182,9 @@ struct wiphy_vendor_command {
struct wiphy {
/* assign these fields before you register the wiphy */
diff --git a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
index a189866b..f86b06a4 100644
--- a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -6816,7 +6816,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -6848,7 +6848,9 @@ static int nl80211_dump_scan(struct sk_b
spin_lock_bh(&rdev->bss_lock);
cfg80211_bss_expire(rdev);
diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
index 46b919b5..9b614110 100644
--- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
+++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1255,6 +1255,7 @@ struct ieee80211_local {
+@@ -1251,6 +1251,7 @@ struct ieee80211_local {
struct mutex chanctx_mtx;
#ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
index 92cb6ff0..d78d2cc8 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1096,10 +1096,20 @@ static void ieee80211_uninit(struct net_
+@@ -1097,10 +1097,20 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -21,7 +21,7 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1145,10 +1155,20 @@ static const struct net_device_ops ieee8
+@@ -1146,10 +1156,20 @@ static const struct net_device_ops ieee8
.ndo_get_stats64 = ieee80211_get_stats64,
};
diff --git a/patches/collateral-evolutions/network/0053-possible_net_t.patch b/patches/collateral-evolutions/network/0053-possible_net_t.patch
index 7ec736e0..6549e432 100644
--- a/patches/collateral-evolutions/network/0053-possible_net_t.patch
+++ b/patches/collateral-evolutions/network/0053-possible_net_t.patch
@@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 04e5785..a251da1 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -3305,12 +3305,12 @@ struct wiphy {
+@@ -3308,12 +3308,12 @@ struct wiphy {
static inline struct net *wiphy_net(struct wiphy *wiphy)
{