[kernel/f19] Linux v3.9-rc5-108-g118c9a4

[Justin M. Forbes]

commit f545817e3c410f58a8da69a3ae06ff71a4b2f1cd
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Apr 2 15:25:06 2013 -0500

    Linux v3.9-rc5-108-g118c9a4

 cfg80211-mac80211-disconnect-on-suspend.patch      |    6 +-
 kernel.spec                                        |   14 ++---
 ...211-Dont-restart-sta-timer-if-not-running.patch |   55 --------------------
 sources                                            |    1 +
 4 files changed, 10 insertions(+), 66 deletions(-)
---
diff --git a/cfg80211-mac80211-disconnect-on-suspend.patch b/cfg80211-mac80211-disconnect-on-suspend.patch
index 92ab492..b3180fb 100644
--- a/cfg80211-mac80211-disconnect-on-suspend.patch
+++ b/cfg80211-mac80211-disconnect-on-suspend.patch
@@ -141,16 +141,16 @@ diff --git a/net/wireless/core.h b/net/wireless/core.h
 index 9a2be8d..d5d06fd 100644
 --- a/net/wireless/core.h
 +++ b/net/wireless/core.h
-@@ -500,6 +500,9 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
+@@ -503,6 +503,9 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
  void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
  			       enum nl80211_iftype iftype, int num);
  
 +void cfg80211_leave(struct cfg80211_registered_device *rdev,
 +		    struct wireless_dev *wdev);
 +
- #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
+ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
+ 			      struct wireless_dev *wdev);
  
- #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS
 diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
 index 8c8b26f..d77e1c1 100644
 --- a/net/wireless/rdev-ops.h
diff --git a/kernel.spec b/kernel.spec
index 6d48276..2fde86c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 301
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -731,9 +731,6 @@ Patch21262: x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
 Patch21273: cfg80211-mac80211-disconnect-on-suspend.patch
 Patch21274: mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
 
-#rhbz 920218
-Patch21276: mac80211-Dont-restart-sta-timer-if-not-running.patch
-
 #rhbz 859282
 Patch21275: VMX-x86-handle-host-TSC-calibration-failure.patch
 
@@ -1441,9 +1438,6 @@ ApplyPatch mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
 #rhbz 859282
 ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
 
-#rhbz 920218
-ApplyPatch mac80211-Dont-restart-sta-timer-if-not-running.patch
-
 #rhbz 927469
 ApplyPatch fix-child-thread-introspection.patch
 
@@ -2284,6 +2278,10 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 02 2013 Justin M. Forbes <jforbes at redhat.com> - 3.9.0-0.rc5.git1.301
+- Linux v3.9-rc5-108-g118c9a4
+- Reenable debugging options.
+
 * Tue Apr 02 2013 Josh Boyer <jwboyer at redhat.com>
 - Enable CONFIG_FB_MATROX_G on powerpc
 
diff --git a/sources b/sources
index 9eae90e..fb4253d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 1c738edfc54e7c65faeb90c436104e2f  linux-3.8.tar.xz
 0f6de99ae977b38feb460fbd4e1288a3  patch-3.9-rc5.xz
+becd731256239cc2f08c9edcc0b72f23  patch-3.9-rc5-git1.xz