rpms/kernel/devel kernel.spec, 1.620, 1.621 linux-2.6-firewire-git-update.patch, 1.13, 1.14

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24061

Modified Files:
	kernel.spec linux-2.6-firewire-git-update.patch 
Log Message:
* Thu Apr 17 2008 Jarod Wilson <jwilson at redhat.com> 2.6.25-2
- Back out FireWire patch requiring successive selfID complete
  events, needs more work to keep from causing sbp2 issues (#435550)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -r1.620 -r1.621
--- kernel.spec	17 Apr 2008 04:38:59 -0000	1.620
+++ kernel.spec	17 Apr 2008 18:47:51 -0000	1.621
@@ -1765,7 +1765,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
-* Thu Apr 17 2008 Kyle McMartin <kmcmartin at redhat.com>
+* Thu Apr 17 2008 Jarod Wilson <jwilson at redhat.com> 2.6.25-2
+- Back out FireWire patch requiring successive selfID complete
+  events, needs more work to keep from causing sbp2 issues (#435550)
+
+* Thu Apr 17 2008 Kyle McMartin <kmcmartin at redhat.com> 2.6.25-1
 - Linux 2.6.25
 - linux-2.6-wireless.patch merged upstream
 

linux-2.6-firewire-git-update.patch:

Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-firewire-git-update.patch	13 Apr 2008 02:57:01 -0000	1.13
+++ linux-2.6-firewire-git-update.patch	17 Apr 2008 18:47:51 -0000	1.14
@@ -1881,12 +1881,12 @@
 +	 * previously processed one, we cannot reliably compare the
 +	 * old and new topologies.
 +	 */
-+	if (!is_next_generation(generation, card->generation) &&
++	/*if (!is_next_generation(generation, card->generation) &&
 +	    card->local_node != NULL) {
 +		fw_notify("skipped bus generations, destroying all nodes\n");
 +		fw_destroy_nodes(card);
 +		card->bm_retries = 0;
-+	}
++	}*/
 +
  	spin_lock_irqsave(&card->lock, flags);