diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-12 00:09:09 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-17 16:23:08 -0700 |
| commit | 066bb19bcf0f55109f5780e8ed0c2786f4462932 (patch) | |
| tree | cd6a2676df79f0d3f677006d8fefb18f27adad70 /patches/collateral-evolutions/generic | |
| parent | be4a0f9ad7e17670d7a30c9e94d5dd918425f90a (diff) | |
backports: refresh patches for next-20140409 and next-20140411
We were required to refresh patches for next-20140409 but for next-20140411
no changes were required. Since no actual commit is necessary next time
this happens (which can often, hence -- automatic backports --) I'll
just peg the results on the PGP signed tag for the release. I'll peg
this commit with both next tags because of this. Just run git describe
to find out the respective linux-next tag you should be using as that is
the latest validated one.
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean --refresh \
/home/mcgrof/linux-next /home/mcgrof/build/next-20140409
Copy original source files ...
Apply patches ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m30.186s
user 9m25.180s
sys 0m24.428s
mcgrof@drvbp1 ~/build/next-20140409 $ time ckmake --allyesconfig
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.54 [ OK ]
4 3.3.8 [ OK ]
5 3.4.79 [ 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.29 [ OK ]
12 3.11.10 [ OK ]
13 3.12.10 [ OK ]
14 3.13.2 [ OK ]
15 3.14-rc1 [ OK ]
real 26m54.859s
user 744m15.764s
sys 83m47.440s
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean
--refresh /home/mcgrof/linux-next /home/mcgrof/build/next-20140411
Copy original source files ...
Apply patches ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m30.437s
user 9m22.812s
sys 0m24.484s
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.54 [ OK ]
4 3.3.8 [ OK ]
5 3.4.79 [ 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.29 [ OK ]
12 3.11.10 [ OK ]
13 3.12.10 [ OK ]
14 3.13.2 [ OK ]
15 3.14-rc1 [ OK ]
real 28m21.215s
user 786m8.468s
sys 86m46.564s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/generic')
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch index e9b09134..5fa2e98e 100644 --- a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch +++ b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch @@ -25,7 +25,7 @@ }; static void ssb_buses_lock(void) -@@ -1463,6 +1472,7 @@ static int __init ssb_modinit(void) +@@ -1459,6 +1468,7 @@ static int __init ssb_modinit(void) { int err; diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch index 8099fabc..a6338c6b 100644 --- a/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch +++ b/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch @@ -25,7 +25,7 @@ }; static DEFINE_MUTEX(wpan_phy_mutex); -@@ -203,6 +212,7 @@ EXPORT_SYMBOL(wpan_phy_free); +@@ -197,6 +206,7 @@ EXPORT_SYMBOL(wpan_phy_free); static int __init wpan_phy_class_init(void) { int rc; diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch index e6762198..9c532c29 100644 --- a/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch +++ b/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch @@ -13,7 +13,7 @@ static void wiphy_dev_release(struct device *dev) { -@@ -151,7 +156,11 @@ struct class ieee80211_class = { +@@ -149,7 +154,11 @@ struct class ieee80211_class = { .name = "ieee80211", .owner = THIS_MODULE, .dev_release = wiphy_dev_release, @@ -25,7 +25,7 @@ .dev_uevent = wiphy_uevent, #ifdef CONFIG_PM .suspend = wiphy_suspend, -@@ -165,6 +174,7 @@ struct class ieee80211_class = { +@@ -161,6 +170,7 @@ struct class ieee80211_class = { int wiphy_sysfs_init(void) { |