rpms/kernel/F-7 linux-2.6-net-e100-disable-polling.patch, NONE, 1.1 kernel-2.6.spec, 1.3371, 1.3372 linux-2.6-pmtrace-time-fix.patch, 1.1, 1.2

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel-2.6.spec linux-2.6-pmtrace-time-fix.patch 
Added Files:
	linux-2.6-net-e100-disable-polling.patch 
Log Message:
* Thu Nov 01 2007 Chuck Ebbert <cebbert at redhat.com>
- e100: don't crash on startup


linux-2.6-net-e100-disable-polling.patch:

--- NEW FILE linux-2.6-net-e100-disable-polling.patch ---
--- linux-2.6.23.noarch/drivers/net/e100.c~	2007-10-18 16:10:40.000000000 -0400
+++ linux-2.6.23.noarch/drivers/net/e100.c	2007-10-18 16:16:02.000000000 -0400
@@ -2682,6 +2682,8 @@ static int __devinit e100_probe(struct p
 	if (err)
 		DPRINTK(PROBE, ERR, "Error clearing wake event\n");
 
+	netif_poll_disable(netdev);
+
 	strcpy(netdev->name, "eth%d");
 	if((err = register_netdev(netdev))) {
 		DPRINTK(PROBE, ERR, "Cannot register net device, aborting.\n");


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3371
retrieving revision 1.3372
diff -u -r1.3371 -r1.3372
--- kernel-2.6.spec	31 Oct 2007 23:58:27 -0000	1.3371
+++ kernel-2.6.spec	1 Nov 2007 23:47:48 -0000	1.3372
@@ -614,6 +614,7 @@
 Patch717: linux-2.6-netdev-e1000e-08.patch
 Patch718: linux-2.6-netdev-e1000e-09.patch
 Patch719: linux-2.6-netdev-e1000e-10.patch
+Patch730: linux-2.6-net-e100-disable-polling.patch
 
 Patch750: linux-2.6-firewire-multi-lun.patch
 Patch751: linux-2.6-firewire-lockdep.patch
@@ -1300,6 +1301,8 @@
 ApplyPatch linux-2.6-netdev-e1000e-08.patch
 ApplyPatch linux-2.6-netdev-e1000e-09.patch
 ApplyPatch linux-2.6-netdev-e1000e-10.patch
+# fix e100 crash on init
+ApplyPatch linux-2.6-net-e100-disable-polling.patch
 
 # ALSA
 #
@@ -2267,6 +2270,9 @@
 %endif
 
 %changelog
+* Thu Nov 01 2007 Chuck Ebbert <cebbert at redhat.com>
+- e100: don't crash on startup
+
 * Wed Oct 31 2007 Chuck Ebbert <cebbert at redhat.com>
 - Copy iwl wireless updates from Fedora 8 (#349981).
 - Fix read after direct IO write returning stale data.

linux-2.6-pmtrace-time-fix.patch:

Index: linux-2.6-pmtrace-time-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-pmtrace-time-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-pmtrace-time-fix.patch	29 Aug 2007 19:35:58 -0000	1.1
+++ linux-2.6-pmtrace-time-fix.patch	1 Nov 2007 23:47:48 -0000	1.2
@@ -1,6 +1,27 @@
---- linux-2.6.22.noarch/drivers/base/power/trace.c~	2007-08-29 15:34:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/base/power/trace.c	2007-08-29 15:34:24.000000000 -0400
-@@ -114,7 +114,7 @@ static unsigned int read_magic_time(void
+From: Rafael J. Wysocki <rjw at sisk.pl>
+Date: Thu, 18 Oct 2007 10:04:48 +0000 (-0700)
+Subject: pm_trace displays the wrong time from the RTC
+X-Git-Tag: v2.6.24-rc1~428
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f059bca1c57f665211dc23de1fb31c1849b65c7b
+
+pm_trace displays the wrong time from the RTC
+
+The way in which read_magic_time() displays the date read from the RTC is
+apparently confusing to the users (cf.
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250238).  Make it
+print dates in the standard way.
+
+Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
+Acked-by: Dave Jones <davej at redhat.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+
+diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
+index 2b0c601..2b4b392 100644
+--- a/drivers/base/power/trace.c
++++ b/drivers/base/power/trace.c
+@@ -114,7 +114,7 @@ static unsigned int read_magic_time(void)
  	get_rtc_time(&time);
  	printk("Time: %2d:%02d:%02d  Date: %02d/%02d/%02d\n",
  		time.tm_hour, time.tm_min, time.tm_sec,