rpms/kernel/F-8 patch-2.6.25.14.bz2.sign, NONE, 1.1 .cvsignore, 1.732, 1.733 kernel.spec, 1.506, 1.507 linux-2.6-upstream-reverts.patch, 1.12, 1.13 sources, 1.693, 1.694 upstream, 1.613, 1.614 linux-2.6-alsa-trident-spdif.patch, 1.1, NONE linux-2.6-libata-pata_atiixp-dont-disable.patch, 1.1, NONE linux-2.6-libata-retry-enabling-ahci.patch, 1.1, NONE patch-2.6.25.13.bz2.sign, 1.1, NONE

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.25.14.bz2.sign 
Removed Files:
	linux-2.6-alsa-trident-spdif.patch 
	linux-2.6-libata-pata_atiixp-dont-disable.patch 
	linux-2.6-libata-retry-enabling-ahci.patch 
	patch-2.6.25.13.bz2.sign 
Log Message:
Linux 2.6.25.14
  Dropped patches:
    linux-2.6-alsa-trident-spdif.patch
    linux-2.6-libata-retry-enabling-ahci.patch
    linux-2.6-libata-pata_atiixp-dont-disable.patch
  Reverted from 2.6.25.14:
    ath5k-don-t-enable-msi-we-cannot-handle-it-yet.patch
    b43legacy-release-mutex-in-error-handling-code.patch


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

iD8DBQBIk2eEyGugalF9Dw4RAoMdAJ9lfeoGRwVSD7nXKFW7y713OAtobACeMPsH
N1zo9obUbxRsL8Z8Xv8XQKI=
=epsk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v
retrieving revision 1.732
retrieving revision 1.733
diff -u -r1.732 -r1.733
--- .cvsignore	28 Jul 2008 19:10:50 -0000	1.732
+++ .cvsignore	1 Aug 2008 21:36:30 -0000	1.733
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.25
 linux-2.6.25.tar.bz2
-patch-2.6.25.13.bz2
+patch-2.6.25.14.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- kernel.spec	1 Aug 2008 15:28:05 -0000	1.506
+++ kernel.spec	1 Aug 2008 21:36:30 -0000	1.507
@@ -33,7 +33,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 13
+%define stable_update 14
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -584,7 +584,6 @@
 Patch91: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 Patch92: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch93: linux-2.6-alsa-kill-annoying-messages.patch
-Patch94: linux-2.6-alsa-trident-spdif.patch
 
 Patch123: linux-2.6-ppc-rtc.patch
 Patch130: linux-2.6-ppc-use-libgcc.patch
@@ -646,8 +645,6 @@
 Patch673: linux-2.6-libata-be-a-bit-more-slack-about-early-devices.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
 Patch675: linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch
-Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch
-Patch677: linux-2.6-libata-retry-enabling-ahci.patch
 Patch678: linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch
 Patch679: linux-2.6-libata-acpi-fix-invalid-context-acpi.patch
 
@@ -1001,8 +998,6 @@
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 # kill annoying messages
 ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch
-# trident fix from F9
-ApplyPatch linux-2.6-alsa-trident-spdif.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch nouveau-drm.patch
@@ -1169,10 +1164,6 @@
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 # fix docking on stations that have a bay device
 ApplyPatch linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch
-# fix DMA disable on atiixp
-ApplyPatch linux-2.6-libata-pata_atiixp-dont-disable.patch
-# retry enabling AHCI mode before reporting error
-ApplyPatch linux-2.6-libata-retry-enabling-ahci.patch
 # fix ahci / ICH6 conflict
 ApplyPatch linux-2.6-libata-ata_piix-dont-attach-to-ich6m-in-ahci-mode.patch
 # fix invalid irq context in libata-acpi (#451896)
@@ -1841,6 +1832,16 @@
 
 
 %changelog
+* Fri Aug 01 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.14-67
+- Linux 2.6.25.14
+  Dropped patches:
+    linux-2.6-alsa-trident-spdif.patch
+    linux-2.6-libata-retry-enabling-ahci.patch
+    linux-2.6-libata-pata_atiixp-dont-disable.patch
+  Reverted from 2.6.25.14:
+    ath5k-don-t-enable-msi-we-cannot-handle-it-yet.patch
+    b43legacy-release-mutex-in-error-handling-code.patch
+
 * Fri Aug 01 2008 John W. Linville <linville at redhat.com> 2.6.25.13-66
 - Upstream wireless updates from 2008-07-14
   (http://marc.info/?l=linux-wireless&m=121606436000705&w=2)

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-upstream-reverts.patch	24 Jul 2008 21:18:53 -0000	1.12
+++ linux-2.6-upstream-reverts.patch	1 Aug 2008 21:36:30 -0000	1.13
@@ -704,3 +704,114 @@
  			goto retry;
  		}
  		memcpy(&store->control, control,
+From jejb at kernel.org  Wed Jul 30 14:15:36 2008
+From: Pavel Roskin <proski at gnu.org>
+Date: Wed, 30 Jul 2008 18:20:14 GMT
+Subject: ath5k: don't enable MSI, we cannot handle it yet
+To: jejb at kernel.org, stable at kernel.org
+Message-ID: <200807301820.m6UIKELK025900 at hera.kernel.org>
+
+From: Pavel Roskin <proski at gnu.org>
+
+commit 256b152b005e319f985f50f2a910a75ba0def74f upstream
+
+MSI is a nice thing, but we cannot enable it without changing the
+interrupt handler.  If we do it, we break MSI capable hardware,
+specifically AR5006 chipset.
+
+Signed-off-by: Pavel Roskin <proski at gnu.org>
+Acked-by: Nick Kossifidis <mickflemm at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/wireless/ath5k/base.c |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/drivers/net/wireless/ath5k/base.c
++++ b/drivers/net/wireless/ath5k/base.c
+@@ -484,9 +484,6 @@ ath5k_pci_probe(struct pci_dev *pdev,
+ 	/* Set private data */
+ 	pci_set_drvdata(pdev, hw);
+ 
+-	/* Enable msi for devices that support it */
+-	pci_enable_msi(pdev);
+-
+ 	/* Setup interrupt handler */
+ 	ret = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
+ 	if (ret) {
+@@ -553,7 +550,6 @@ err_ah:
+ err_irq:
+ 	free_irq(pdev->irq, sc);
+ err_free:
+-	pci_disable_msi(pdev);
+ 	ieee80211_free_hw(hw);
+ err_map:
+ 	pci_iounmap(pdev, mem);
+@@ -575,7 +571,6 @@ ath5k_pci_remove(struct pci_dev *pdev)
+ 	ath5k_detach(pdev, hw);
+ 	ath5k_hw_detach(sc->ah);
+ 	free_irq(pdev->irq, sc);
+-	pci_disable_msi(pdev);
+ 	pci_iounmap(pdev, sc->iobase);
+ 	pci_release_region(pdev, 0);
+ 	pci_disable_device(pdev);
+From jejb at kernel.org  Wed Jul 30 14:15:03 2008
+From: Julia Lawall <julia at diku.dk>
+Date: Wed, 30 Jul 2008 18:20:12 GMT
+Subject: b43legacy: Release mutex in error handling code
+To: jejb at kernel.org, stable at kernel.org
+Message-ID: <200807301820.m6UIKCFB025870 at hera.kernel.org>
+
+From: Julia Lawall <julia at diku.dk>
+
+commit 4104863fb4a724723d1d5f3cba9d3c5084087e45 upstream
+
+The mutex is released on a successful return, so it would seem that it
+should be released on an error return as well.
+
+The semantic patch finds this problem is as follows:
+(http://www.emn.fr/x-info/coccinelle/)
+
+// <smpl>
+@@
+expression l;
+@@
+
+mutex_lock(l);
+.. when != mutex_unlock(l)
+    when any
+    when strict
+(
+if (...) { ... when != mutex_unlock(l)
++   mutex_unlock(l);
+    return ...;
+}
+|
+mutex_unlock(l);
+)
+// </smpl>
+
+Signed-off-by: Julia Lawall <julia at diku.dk>
+Signed-off-by: Michael Buesch <mb at bu3sch.de>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/wireless/b43legacy/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/b43legacy/main.c
++++ b/drivers/net/wireless/b43legacy/main.c
+@@ -3792,10 +3792,10 @@ static int b43legacy_resume(struct ssb_d
+ 			goto out;
+ 		}
+ 	}
+-	mutex_unlock(&wl->mutex);
+ 
+ 	b43legacydbg(wl, "Device resumed.\n");
+ out:
++	mutex_unlock(&wl->mutex);
+ 	return err;
+ }
+ 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -r1.693 -r1.694
--- sources	28 Jul 2008 19:10:50 -0000	1.693
+++ sources	1 Aug 2008 21:36:30 -0000	1.694
@@ -1,2 +1,2 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
-39578e23ad899c2a418c7ca89b4248bb  patch-2.6.25.13.bz2
+5b3f6ce9a5c787859413758ea214a89d  patch-2.6.25.14.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- upstream	28 Jul 2008 19:10:50 -0000	1.613
+++ upstream	1 Aug 2008 21:36:30 -0000	1.614
@@ -1,2 +1,2 @@
 linux-2.6.25.tar.bz2
-patch-2.6.25.13.bz2
+patch-2.6.25.14.bz2


--- linux-2.6-alsa-trident-spdif.patch DELETED ---


--- linux-2.6-libata-pata_atiixp-dont-disable.patch DELETED ---


--- linux-2.6-libata-retry-enabling-ahci.patch DELETED ---


--- patch-2.6.25.13.bz2.sign DELETED ---