compat-drivers: Sync with linux-next 20120906

PATCH Applied Ozan Çağlayan 2 participants 3 messages Sep 6, 2012 – Sep 7, 2012

lore

Share & tools

lore

Ozan Çağlayan

author

2012-09-06 19:50 UTC #0 lore raw

PATCH 1/2 compat-drivers: Sync with linux-next 20120906

Refresh patches for next-20120906

Signed-off-by Ozan Çağlayan <[email protected]>

---
 patches/network/04-netns.patch           |  2 +-
 patches/network/29-sdio_no_suspend.patch |  2 +-
 patches/network/62-usb_driver_lpm.patch  | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

patches/network/04-netns.patch +1 -1

index 70b6f41..07d059e 100644
@@ -6,7 +6,7 @@ files...
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5712,7 +5712,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5714,7 +5714,9 @@ static int nl80211_wiphy_netns(struct sk
  	if (!net_eq(wiphy_net(&rdev->wiphy), net))
  		err = cfg80211_switch_netns(rdev, net);

patches/network/29-sdio_no_suspend.patch +1 -1

index 247cd1b..5f4c82f 100644
@@ -60,7 +60,7 @@ suspend and resume that are not backported.
  static int if_sdio_suspend(struct device *dev)
  {
  	struct sdio_func *func = dev_to_sdio_func(dev);
-@@ -1373,15 +1374,18 @@ static const struct dev_pm_ops if_sdio_p
+@@ -1378,15 +1379,18 @@ static const struct dev_pm_ops if_sdio_p
  	.suspend	= if_sdio_suspend,
  	.resume		= if_sdio_resume,
  };

patches/network/62-usb_driver_lpm.patch +5 -5

index 2ca1fd6..9aeba44 100644
@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/ath3k.c
 +++ b/drivers/bluetooth/ath3k.c
-@@ -450,7 +450,9 @@ static struct usb_driver ath3k_driver =
+@@ -452,7 +452,9 @@ static struct usb_driver ath3k_driver =
  	.probe		= ath3k_probe,
  	.disconnect	= ath3k_disconnect,
  	.id_table	= ath3k_table,

@@ -48,7 +48,7 @@
  module_usb_driver(bpa10x_driver);
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -1219,7 +1219,9 @@ static struct usb_driver btusb_driver =
+@@ -1221,7 +1221,9 @@ static struct usb_driver btusb_driver =
  #endif
  	.id_table	= btusb_table,
  	.supports_autosuspend = 1,

@@ -204,7 +204,7 @@
  module_usb_driver(rndis_wlan_driver);
 --- a/drivers/net/wireless/rt2x00/rt2500usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
-@@ -1980,7 +1980,9 @@ static struct usb_driver rt2500usb_drive
+@@ -1989,7 +1989,9 @@ static struct usb_driver rt2500usb_drive
  	.disconnect	= rt2x00usb_disconnect,
  	.suspend	= rt2x00usb_suspend,
  	.resume		= rt2x00usb_resume,

@@ -216,7 +216,7 @@
  module_usb_driver(rt2500usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1304,7 +1304,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1322,7 +1322,9 @@ static struct usb_driver rt2800usb_drive
  	.disconnect	= rt2x00usb_disconnect,
  	.suspend	= rt2x00usb_suspend,
  	.resume		= rt2x00usb_resume,

@@ -228,7 +228,7 @@
  module_usb_driver(rt2800usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt73usb.c
 +++ b/drivers/net/wireless/rt2x00/rt73usb.c
-@@ -2527,7 +2527,9 @@ static struct usb_driver rt73usb_driver
+@@ -2536,7 +2536,9 @@ static struct usb_driver rt73usb_driver
  	.disconnect	= rt2x00usb_disconnect,
  	.suspend	= rt2x00usb_suspend,
  	.resume		= rt2x00usb_resume,

Signature · 1 line

1.7.11.4

Ozan Çağlayan

author

2012-09-06 19:50 UTC #1 lore raw

PATCH 2/2 compat-drivers: Update 53-pr_fmt.patch

Fix ath5k/debug.c redefinition warning for pr_fmt macro

Signed-off-by Ozan Çağlayan <[email protected]>

---
 patches/network/53-pr_fmt.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

patches/network/53-pr_fmt.patch +13 -0

index 4c29be6..f1af016 100644
@@ -819,3 +819,16 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/slab.h>
  
  #include "ath5k.h"
+--- a/drivers/net/wireless/ath/ath5k/debug.c
++++ b/drivers/net/wireless/ath/ath5k/debug.c
+@@ -58,8 +58,10 @@
+  * THE POSSIBILITY OF SUCH DAMAGES.
+  */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
++#include <linux/printk.h>
+ #include <linux/export.h>
+ #include <linux/moduleparam.h>
+

Signature · 1 line

1.7.11.4

Luis R. Rodriguez

Applied

2012-09-07 00:33 UTC #2 lore raw

Re: [PATCH 2/2] compat-drivers: Update 53-pr_fmt.patch

On Thu, Sep 6, 2012 at 12:49 PM, Ozan =C3=87a=C4=9Flayan <[email protected]=

Quoted 5 lines

wrote:
Fix ath5k/debug.c redefinition warning for pr_fmt macro
Signed-off-by Ozan =C3=87a=C4=9Flayan <[email protected]>
---

Thanks, applied and pushed. With this and a typo fix from my previous atomic patch we now get compilation back on track:

mcgrof@garbanzo ~/devel/compat-drivers (git::master)$ time ckmake Trying kernel 3.5.0-030500-generic [OK]
Trying kernel 3.4.4-030404-generic [OK]
Trying kernel 3.3.7-030307-generic [OK]
Trying kernel 3.2.2-030202-generic [OK]
Trying kernel 3.1.10-030110-generic [OK]
Trying kernel 3.0.18-030018-generic [OK]
Trying kernel 2.6.39-02063904-generic [OK]
Trying kernel 2.6.38-02063808-generic [OK]
Trying kernel 2.6.37-02063706-generic [OK]
Trying kernel 2.6.36-02063604-generic [OK]
Trying kernel 2.6.35-02063512-generic [OK]
Trying kernel 2.6.34-02063410-generic [OK]
Trying kernel 2.6.33-02063305-generic [OK]
Trying kernel 2.6.32-02063255-generic [OK]
Trying kernel 2.6.31-02063113-generic [OK]
Trying kernel 2.6.30-02063010-generic [OK]
Trying kernel 2.6.29-02062906-generic [OK]
Trying kernel 2.6.28-02062810-generic [OK]
Trying kernel 2.6.27-020627-generic [OK]
Trying kernel 2.6.26-020626-generic [OK]
Trying kernel 2.6.25-020625-generic [OK]
Trying kernel 2.6.24-020624-generic [OK]

real    27m16.075s
user    143m0.604s
sys     13m36.899s

Luis