rpms/kernel/F-9 patch-2.6.25.7.bz2.sign, NONE, 1.1 .cvsignore, 1.814, 1.815 kernel.spec, 1.682, 1.683 linux-2.6-upstream-reverts.patch, 1.3, 1.4 sources, 1.775, 1.776 upstream, 1.694, 1.695 linux-2.6-af_key-fix-selector-family-initialization.patch, 1.1, NONE linux-2.6-alsa-emu10k1-fix-audigy2.patch, 1.1, NONE linux-2.6-mmc-wbsd-fix-request_irq.patch, 1.1, NONE linux-2.6-netlink-fix-parse-of-nested-attributes.patch, 1.1, NONE patch-2.6.25.6.bz2.sign, 1.1, NONE

Tue Jun 17 02:18:55 UTC 2008

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28835

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.25.7.bz2.sign 
Removed Files:
	linux-2.6-af_key-fix-selector-family-initialization.patch 
	linux-2.6-alsa-emu10k1-fix-audigy2.patch 
	linux-2.6-mmc-wbsd-fix-request_irq.patch 
	linux-2.6-netlink-fix-parse-of-nested-attributes.patch 
	patch-2.6.25.6.bz2.sign 
Log Message:
* Mon Jun 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.7-64
- Linux 2.6.25.7
- Don't apply upstream-reverts patch to -vanilla kernels.
- Dropped patches:
    linux-2.6-alsa-emu10k1-fix-audigy2.patch
    linux-2.6-netlink-fix-parse-of-nested-attributes.patch
    linux-2.6-af_key-fix-selector-family-initialization.patch
    linux-2.6-mmc-wbsd-fix-request_irq.patch
- Reverted wireless patches from 2.6.25.7, already in Fedora:
    b43-fix-controller-restart-crash.patch
    mac80211-send-association-event-on-ibss-create.patch
    ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable.patch

--- NEW FILE patch-2.6.25.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIVs98yGugalF9Dw4RAhoGAJ9B0V++aMIl+At6zO4P7RMMNl3CcQCgjG++
7kkrL2PAOrz3Y9aoeLS/UxM=
=VlGl
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- .cvsignore	9 Jun 2008 20:24:45 -0000	1.814
+++ .cvsignore	17 Jun 2008 02:17:41 -0000	1.815
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.25
 linux-2.6.25.tar.bz2
-patch-2.6.25.6.bz2
+patch-2.6.25.7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- kernel.spec	15 Jun 2008 21:13:28 -0000	1.682
+++ kernel.spec	17 Jun 2008 02:17:41 -0000	1.683
@@ -31,7 +31,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 6
+%define stable_update 7
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -556,8 +556,6 @@
 # stable release candidate
 # Patch03: patch-2.6.25.6-rc1.bz2
 
-Patch10: linux-2.6-upstream-reverts.patch
-
 # we always need nonintconfig, even for -vanilla kernels
 Patch06: linux-2.6-build-nonintconfig.patch
 
@@ -567,6 +565,8 @@
 
 %if !%{nopatches}
 
+# revert upstream patches we get via other methods
+Patch09: linux-2.6-upstream-reverts.patch
 Patch10: linux-2.6-hotfixes.patch
 
 Patch21: linux-2.6-utrace.patch
@@ -610,7 +610,6 @@
 Patch411: linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
 Patch411: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch413: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
-Patch414: linux-2.6-alsa-emu10k1-fix-audigy2.patch
 
 # filesystem patches
 Patch421: linux-2.6-squashfs.patch
@@ -619,14 +618,10 @@
 Patch424: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch432: linux-2.6-netlink-fix-parse-of-nested-attributes.patch
-Patch433: linux-2.6-af_key-fix-selector-family-initialization.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
 Patch452: linux-2.6-hwmon-applesmc-remove-debugging-messages.patch
-# fix oops in wbsd mmc driver
-Patch453: linux-2.6-mmc-wbsd-fix-request_irq.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
@@ -1016,7 +1011,6 @@
 # builds (as used in the buildsystem).
 ApplyPatch linux-2.6-build-nonintconfig.patch
 
-ApplyPatch linux-2.6-upstream-reverts.patch -R
 
 #
 # misc small stuff to make things compile
@@ -1031,6 +1025,7 @@
 
 %if !%{nopatches}
 
+ApplyPatch linux-2.6-upstream-reverts.patch -R
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
@@ -1150,8 +1145,6 @@
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A.patch
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
-# fix SB audigy2 ZS
-ApplyPatch linux-2.6-alsa-emu10k1-fix-audigy2.patch
 
 # Filesystem patches.
 # cifs
@@ -1165,10 +1158,6 @@
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# fix parse of netlink messages
-ApplyPatch linux-2.6-netlink-fix-parse-of-nested-attributes.patch
-# fix initialization of af_key sockets
-ApplyPatch linux-2.6-af_key-fix-selector-family-initialization.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1177,8 +1166,6 @@
 ApplyPatch linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
 # kill annoying applesmc debug messages
 ApplyPatch linux-2.6-hwmon-applesmc-remove-debugging-messages.patch
-# fix oops when mmc card is present during boot
-ApplyPatch linux-2.6-mmc-wbsd-fix-request_irq.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1860,6 +1847,19 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.7-64
+- Linux 2.6.25.7
+- Don't apply upstream-reverts patch to -vanilla kernels.
+- Dropped patches:
+    linux-2.6-alsa-emu10k1-fix-audigy2.patch
+    linux-2.6-netlink-fix-parse-of-nested-attributes.patch
+    linux-2.6-af_key-fix-selector-family-initialization.patch
+    linux-2.6-mmc-wbsd-fix-request_irq.patch
+- Reverted wireless patches from 2.6.25.7, already in Fedora:
+    b43-fix-controller-restart-crash.patch
+    mac80211-send-association-event-on-ibss-create.patch
+    ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable.patch
+
 * Sun Jun 15 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-63
 - Make rsync able to write to VFAT partitions again. (#449080)
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-upstream-reverts.patch	7 May 2008 06:45:07 -0000	1.3
+++ linux-2.6-upstream-reverts.patch	17 Jun 2008 02:17:41 -0000	1.4
@@ -184,3 +184,145 @@
  	return 0;
  unsupported:
  	ssb_printk(KERN_WARNING PFX "Unsupported SPROM revision %d "
+From 3bf0a32e22fedc0b46443699db2d61ac2a883ac4 Mon Sep 17 00:00:00 2001
+Message-Id: <200806061558.42998.mb at bu3sch.de>
+From: Michael Buesch <mb at bu3sch.de>
+Date: Thu, 22 May 2008 16:32:16 +0200
+Subject: b43: Fix controller restart crash
+
+From: Michael Buesch <mb at bu3sch.de>
+
+upstream commit: 3bf0a32e22fedc0b46443699db2d61ac2a883ac4
+
+This fixes a kernel crash on rmmod, in the case where the controller
+was restarted before doing the rmmod.
+
+Signed-off-by: Michael Buesch <mb at bu3sch.de>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Chris Wright <chrisw at sous-sol.org>
+---
+ drivers/net/wireless/b43/main.c |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -3818,7 +3818,9 @@ static void b43_chip_reset(struct work_s
+ 			goto out;
+ 		}
+ 	}
+-      out:
++out:
++	if (err)
++		wl->current_dev = NULL; /* Failed to init the dev. */
+ 	mutex_unlock(&wl->mutex);
+ 	if (err)
+ 		b43err(wl, "Controller restart FAILED\n");
+@@ -3967,9 +3969,11 @@ static void b43_one_core_detach(struct s
+ 	struct b43_wldev *wldev;
+ 	struct b43_wl *wl;
+ 
++	/* Do not cancel ieee80211-workqueue based work here.
++	 * See comment in b43_remove(). */
++
+ 	wldev = ssb_get_drvdata(dev);
+ 	wl = wldev->wl;
+-	cancel_work_sync(&wldev->restart_work);
+ 	b43_debugfs_remove_device(wldev);
+ 	b43_wireless_core_detach(wldev);
+ 	list_del(&wldev->list);
+@@ -4152,6 +4156,10 @@ static void b43_remove(struct ssb_device
+ 	struct b43_wl *wl = ssb_get_devtypedata(dev);
+ 	struct b43_wldev *wldev = ssb_get_drvdata(dev);
+ 
++	/* We must cancel any work here before unregistering from ieee80211,
++	 * as the ieee80211 unreg will destroy the workqueue. */
++	cancel_work_sync(&wldev->restart_work);
++
+ 	B43_WARN_ON(!wl);
+ 	if (wl->current_dev == wldev)
+ 		ieee80211_unregister_hw(wl->hw);
+From stable-bounces at linux.kernel.org  Mon Jun  9 13:26:37 2008
+From: Michael Buesch <mb at bu3sch.de>
+To: stable at kernel.org
+Date: Sat, 7 Jun 2008 17:57:37 +0200
+Content-Disposition: inline
+Message-Id: <200806071757.38139.mb at bu3sch.de>
+Cc: netdev at vger.kernel.org, linux-kernel at vger.kernel.org
+Subject: ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
+
+From: Michael Buesch <mb at bu3sch.de>
+
+upstream commit: a3bafeedfff2ac5fa0a316bea4570e27900b6fcc
+
+This fixes a context assertion in ssb that makes b44 print
+out warnings on resume.
+
+This fixes the following kernel oops:
+http://www.kerneloops.org/oops.php?number=12732
+http://www.kerneloops.org/oops.php?number=11410
+
+Signed-off-by: Michael Buesch <mb at bu3sch.de>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Chris Wright <chrisw at sous-sol.org>
+
+---
+ drivers/ssb/driver_pcicore.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -519,12 +519,12 @@ int ssb_pcicore_dev_irqvecs_enable(struc
+ 	int err = 0;
+ 	u32 tmp;
+ 
+-	might_sleep();
+-
+ 	if (!pdev)
+ 		goto out;
+ 	bus = pdev->bus;
+ 
++	might_sleep_if(pdev->id.coreid != SSB_DEV_PCI);
++
+ 	/* Enable interrupts for this device. */
+ 	if (bus->host_pci &&
+ 	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
+From 507b06d0622480f8026d49a94f86068bb0fd6ed6 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Tue, 3 Jun 2008 23:39:55 -0400
+Subject: mac80211: send association event on IBSS create
+
+From: Dan Williams <dcbw at redhat.com>
+
+patch 507b06d0622480f8026d49a94f86068bb0fd6ed6 upstream
+
+Otherwise userspace has no idea the IBSS creation succeeded.
+
+Signed-off-by: Dan Williams <dcbw at redhat.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ net/mac80211/ieee80211_sta.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/net/mac80211/ieee80211_sta.c
++++ b/net/mac80211/ieee80211_sta.c
+@@ -2723,6 +2723,7 @@ static int ieee80211_sta_join_ibss(struc
+ 	struct rate_selection ratesel;
+ 	u8 *pos;
+ 	struct ieee80211_sub_if_data *sdata;
++	union iwreq_data wrqu;
+ 
+ 	/* Remove possible STA entries from other IBSS networks. */
+ 	sta_info_flush(local, NULL);
+@@ -2863,6 +2864,10 @@ static int ieee80211_sta_join_ibss(struc
+ 
+ 	ieee80211_rx_bss_put(dev, bss);
+ 
++	memset(&wrqu, 0, sizeof(wrqu));
++	memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
++	wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
++
+ 	return res;
+ }
+ 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- sources	9 Jun 2008 20:24:45 -0000	1.775
+++ sources	17 Jun 2008 02:17:41 -0000	1.776
@@ -1,2 +1,2 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
-124200a50019e7da6010bf7fdd7fb5dc  patch-2.6.25.6.bz2
+015b275011b48f716b3a6b072b18b471  patch-2.6.25.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- upstream	9 Jun 2008 20:24:46 -0000	1.694
+++ upstream	17 Jun 2008 02:17:41 -0000	1.695
@@ -1,2 +1,2 @@
 linux-2.6.25.tar.bz2
-patch-2.6.25.6.bz2
+patch-2.6.25.7.bz2


--- linux-2.6-af_key-fix-selector-family-initialization.patch DELETED ---


--- linux-2.6-alsa-emu10k1-fix-audigy2.patch DELETED ---


--- linux-2.6-mmc-wbsd-fix-request_irq.patch DELETED ---


--- linux-2.6-netlink-fix-parse-of-nested-attributes.patch DELETED ---


--- patch-2.6.25.6.bz2.sign DELETED ---


