Fri Feb 8 20:58:55 UTC 2008

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-acpi-video-backlight-rationalize.patch 
	linux-2.6-highres-timers.patch 
	linux-2.6-net-silence-noisy-printks.patch 
	linux-2.6-netfilter-really-fix-oops-in-nf_nat_move_storage.patch 
	sources upstream 
Added Files:
	linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch 
	patch-2.6.23.15.bz2.sign 
Removed Files:
	linux-2.6-freezer-fix-apm-emulation-breakage.patch 
	patch-2.6.23.14.bz2.sign 
Log Message:
* Fri Feb 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.15-136
- Linux 2.6.23.15
- Fix Megahertz PCMCIA Ethernet adapter (#233255)


linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch:

--- NEW FILE linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch ---
--- a/drivers/net/pcmcia/smc91c92_cs.c	Tue Dec 05 06:09:20 2006 +0500
+++ b/drivers/net/pcmcia/smc91c92_cs.c	Tue Dec 05 06:09:21 2006 +0500
@@ -560,16 +560,8 @@ static int mhz_setup(struct pcmcia_devic
 
     /* Read the station address from the CIS.  It is stored as the last
        (fourth) string in the Version 1 Version/ID tuple. */
-    tuple->DesiredTuple = CISTPL_VERS_1;
-    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
-	rc = -1;
-	goto free_cfg_mem;
-    }
-    /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
-    if (next_tuple(link, tuple, parse) != CS_SUCCESS)
-	first_tuple(link, tuple, parse);
-    if (parse->version_1.ns > 3) {
-	station_addr = parse->version_1.str + parse->version_1.ofs[3];
+    if (link->prod_id[3]) {
+	station_addr = link->prod_id[3];
 	if (cvt_ascii_address(dev, station_addr) == 0) {
 		rc = 0;
 		goto free_cfg_mem;


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

iD8DBQBHrLrdyGugalF9Dw4RAsu2AJ95F4fKc3PQpX7nLMeP9Z4Qu4BJXgCfdFWD
6G6JN+5uDQG/Pwn1ZUWJ57s=
=36ua
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v
retrieving revision 1.714
retrieving revision 1.715
diff -u -r1.714 -r1.715
--- .cvsignore	15 Jan 2008 01:33:29 -0000	1.714
+++ .cvsignore	8 Feb 2008 20:57:57 -0000	1.715
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.23
 linux-2.6.23.tar.bz2
-patch-2.6.23.14.bz2
+patch-2.6.23.15.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- kernel.spec	6 Feb 2008 22:10:21 -0000	1.344
+++ kernel.spec	8 Feb 2008 20:57:57 -0000	1.345
@@ -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 14
+%define stable_update 15
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -557,7 +557,7 @@
 %endif
 
 # -stable RC
-# Patch02: linux-2.6.23.10-stable-snapshot.patch
+# Patch02: patch-2.6.23.15-rc1.bz2
 
 %if !%{nopatches}
 
@@ -721,6 +721,8 @@
 Patch721: linux-2.6-netdev-e1000-disable-alpm.patch
 Patch725: linux-2.6-netdev-atl2-2.0.3.patch
 Patch730: linux-2.6-netdev-spidernet-fix-interrupt-handling.patch
+Patch731: linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
+
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch750: linux-2.6-acpi-git-ec-init-fixes.patch
 Patch761: linux-2.6-acpi-video-backlight-rationalize.patch
@@ -783,7 +785,7 @@
 Patch2203: linux-2.6-selinux-sigchld-wait.patch
 Patch2204: linux-2.6-selinux-ebitmap-loop-bug.patch
 
-Patch2300: linux-2.6-freezer-fix-apm-emulation-breakage.patch
+# Patch2300: linux-2.6-freezer-fix-apm-emulation-breakage.patch
 
 %endif
 
@@ -1067,7 +1069,7 @@
 %endif
 
 # -stable RC
-# ApplyPatch linux-2.6.23.10-stable-snapshot.patch
+# ApplyPatch patch-2.6.23.15-rc1.bz2
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1395,6 +1397,8 @@
 ApplyPatch linux-2.6-netdev-atl2-2.0.3.patch
 # spidernet: fix interrupt handling
 ApplyPatch linux-2.6-netdev-spidernet-fix-interrupt-handling.patch
+# fix station address on meghertz pcmcia adpter (#233255)
+ApplyPatch linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch -R
 
 # ACPI/PM patches
 # fix EC init
@@ -1486,9 +1490,6 @@
 ApplyPatch linux-2.6-selinux-sigchld-wait.patch
 ApplyPatch linux-2.6-selinux-ebitmap-loop-bug.patch
 
-# removed in 2.6.23.10
-ApplyPatch linux-2.6-freezer-fix-apm-emulation-breakage.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2085,6 +2086,10 @@
 
 
 %changelog
+* Fri Feb 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.15-136
+- Linux 2.6.23.15
+- Fix Megahertz PCMCIA Ethernet adapter (#233255)
+
 * Wed Feb 06 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-135
 - Bump version.
 

linux-2.6-acpi-video-backlight-rationalize.patch:

Index: linux-2.6-acpi-video-backlight-rationalize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-acpi-video-backlight-rationalize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-acpi-video-backlight-rationalize.patch	6 Feb 2008 00:48:59 -0000	1.1
+++ linux-2.6-acpi-video-backlight-rationalize.patch	8 Feb 2008 20:57:57 -0000	1.2
@@ -1,22 +1,27 @@
-From: Matthew Garrett <mjg59 at srcf.ucam.org>
-Date: Wed, 26 Dec 2007 02:03:26 +0000 (+0000)
-Subject: ACPI: video: Rationalise ACPI backlight implementation
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=38531e6fe51ad5c7dfe72e0e066b5f54bc1921cd
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=38531e6fe51ad5c7dfe72e0e066b5f54bc1921cd
+Commit:     38531e6fe51ad5c7dfe72e0e066b5f54bc1921cd
+Parent:     aa6299926950c8dfe2fea638276cad6def092bc9
+Author:     Matthew Garrett <mjg59 at srcf.ucam.org>
+AuthorDate: Wed Dec 26 02:03:26 2007 +0000
+Committer:  Len Brown <len.brown at intel.com>
+CommitDate: Fri Feb 1 22:43:31 2008 -0500
 
-ACPI: video: Rationalise ACPI backlight implementation
-
-The sysfs backlight class provides no mechanism for querying the
-acceptable brightness for a backlight. The ACPI spec states that values
-are only valid if they are reported as available by the firmware. Since
-we can't provide that information to userspace, instead collapse the
-range to the number of actual values that can be set.
-
-http://bugzilla.kernel.org/show_bug.cgi?id=9277
-
-Signed-off-by: Matthew Garrett <mjg59 at srcf.ucam.org>
-Acked-by: Zhang Rui <rui.zhang at intel.com>
-Signed-off-by: Len Brown <len.brown at intel.com>
+    ACPI: video: Rationalise ACPI backlight implementation
+    
+    The sysfs backlight class provides no mechanism for querying the
+    acceptable brightness for a backlight. The ACPI spec states that values
+    are only valid if they are reported as available by the firmware. Since
+    we can't provide that information to userspace, instead collapse the
+    range to the number of actual values that can be set.
+    
+    http://bugzilla.kernel.org/show_bug.cgi?id=9277
+    
+    Signed-off-by: Matthew Garrett <mjg59 at srcf.ucam.org>
+    Acked-by: Zhang Rui <rui.zhang at intel.com>
+    Signed-off-by: Len Brown <len.brown at intel.com>
 ---
+ drivers/acpi/video.c |   20 +++++++++++++-------
+ 1 files changed, 13 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
 index bd77e81..59639c9 100644

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-highres-timers.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-highres-timers.patch	10 Dec 2007 19:04:50 -0000	1.19
+++ linux-2.6-highres-timers.patch	8 Feb 2008 20:57:57 -0000	1.20
@@ -3808,8 +3808,8 @@
 --- linux-2.6.23.orig/include/linux/acpi.h	2007-12-10 08:21:07.000000000 +0100
 +++ linux-2.6.23/include/linux/acpi.h	2007-12-10 08:21:08.000000000 +0100
 @@ -189,32 +189,6 @@ extern int ec_transaction(u8 command,
- extern int acpi_blacklisted(void);
- extern void acpi_bios_year(char *s);
+ extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
+ #endif
  
 -#define	ACPI_CSTATE_LIMIT_DEFINED	/* for driver builds */
 -#ifdef	CONFIG_ACPI

linux-2.6-net-silence-noisy-printks.patch:

Index: linux-2.6-net-silence-noisy-printks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-net-silence-noisy-printks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-net-silence-noisy-printks.patch	28 May 2007 01:22:43 -0000	1.2
+++ linux-2.6-net-silence-noisy-printks.patch	8 Feb 2008 20:57:57 -0000	1.3
@@ -37,20 +37,3 @@
  		return NF_ACCEPT;
  	}
  	return nf_conntrack_in(PF_INET, hooknum, pskb);
-
-
-Remove noisy, easy to trigger (as user even, with sfuzz) printk.
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.20.noarch/net/irda/af_irda.c~	2007-04-19 19:07:21.000000000 -0400
-+++ linux-2.6.20.noarch/net/irda/af_irda.c	2007-04-19 19:07:28.000000000 -0400
-@@ -1143,8 +1143,6 @@ static int irda_create(struct socket *so
- 			self->max_sdu_size_rx = TTP_SAR_UNBOUND;
- 			break;
- 		default:
--			IRDA_ERROR("%s: protocol not supported!\n",
--				   __FUNCTION__);
- 			return -ESOCKTNOSUPPORT;
- 		}
- 		break;

linux-2.6-netfilter-really-fix-oops-in-nf_nat_move_storage.patch:

Index: linux-2.6-netfilter-really-fix-oops-in-nf_nat_move_storage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-netfilter-really-fix-oops-in-nf_nat_move_storage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-netfilter-really-fix-oops-in-nf_nat_move_storage.patch	6 Feb 2008 18:19:50 -0000	1.1
+++ linux-2.6-netfilter-really-fix-oops-in-nf_nat_move_storage.patch	8 Feb 2008 20:57:57 -0000	1.2
@@ -1,6 +1,10 @@
-commit 6953954cc566c19a84b7ca9647c16dabe4646c03
-Author: Patrick McHardy <kaber at trash.net>
-Date:   Sat Feb 2 12:01:03 2008 +0100
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=86577c661bc01d5c4e477d74567df4470d6c5138
+Commit:     86577c661bc01d5c4e477d74567df4470d6c5138
+Parent:     b2155e7f70b3f058efe94c0c459db023b05057bd
+Author:     Patrick McHardy <kaber at trash.net>
+AuthorDate: Thu Feb 7 17:56:34 2008 -0800
+Committer:  David S. Miller <davem at davemloft.net>
+CommitDate: Thu Feb 7 17:56:34 2008 -0800
 
     [NETFILTER]: nf_conntrack: fix ct_extend ->move operation
     
@@ -13,10 +17,18 @@
       instead of (void *)ct->ext + ct->ext->offset[i] it uses
       ct->ext + ct->ext->offset[i].
     
-    Should fix a crash on x86_64 reported by Chuck Ebbert <cebbert at redhat.com>
+    Fixes a crash on x86_64 reported by Chuck Ebbert <cebbert at redhat.com>
     and Thomas Woerner <twoerner at redhat.com>.
     
+    Tested-by: Thomas Woerner <twoerner at redhat.com>
+    
     Signed-off-by: Patrick McHardy <kaber at trash.net>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ include/net/netfilter/nf_conntrack_extend.h |    2 +-
+ net/ipv4/netfilter/nf_nat_core.c            |    6 +++---
+ net/netfilter/nf_conntrack_extend.c         |    3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
 index 73b5711..49aac63 100644


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -r1.675 -r1.676
--- sources	15 Jan 2008 01:33:29 -0000	1.675
+++ sources	8 Feb 2008 20:57:57 -0000	1.676
@@ -1,2 +1,2 @@
 2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
-11d3513c45bdcbdf9c75364e747568bd  patch-2.6.23.14.bz2
+abcfefd33764b539dcce7fe3e32b1650  patch-2.6.23.15.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- upstream	15 Jan 2008 01:33:29 -0000	1.596
+++ upstream	8 Feb 2008 20:57:57 -0000	1.597
@@ -1,2 +1,2 @@
 linux-2.6.23.tar.bz2
-patch-2.6.23.14.bz2
+patch-2.6.23.15.bz2


--- linux-2.6-freezer-fix-apm-emulation-breakage.patch DELETED ---


--- patch-2.6.23.14.bz2.sign DELETED ---


