rpms/kernel/devel patch-2.6.20-rc2-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.556, 1.557 kernel-2.6.spec, 1.2894, 1.2895 linux-2.6-compile-fixes.patch, 1.126, 1.127 sources, 1.519, 1.520 upstream, 1.447, 1.448

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13719

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.20-rc2-git1.bz2.sign 
Log Message:
rc2git1


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

iD8DBQBFlWiEyGugalF9Dw4RAoJYAJ9ASG9GAnAE7652gbT+s7dJiHkY4wCfe3Iw
2nOPbvPdcMHLPG6TyflHSkQ=
=cOcq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- .cvsignore	29 Dec 2006 06:06:49 -0000	1.556
+++ .cvsignore	30 Dec 2006 03:33:59 -0000	1.557
@@ -5,3 +5,4 @@
 xen-11633.tar.bz2
 linux-2.6.19.tar.bz2
 patch-2.6.20-rc2.bz2
+patch-2.6.20-rc2-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2894
retrieving revision 1.2895
diff -u -r1.2894 -r1.2895
--- kernel-2.6.spec	29 Dec 2006 11:01:37 -0000	1.2894
+++ kernel-2.6.spec	30 Dec 2006 03:33:59 -0000	1.2895
@@ -296,7 +296,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.20-rc2.bz2
-#Patch2: patch-2.6.20-rc1-git5.bz2
+Patch2: patch-2.6.20-rc2-git1.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -723,7 +723,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1810,6 +1810,9 @@
 #  - tux.
 
 %changelog
+* Fri Dec 29 2006 Dave Jones <davej at redhat.com>
+- 2.6.20rc2-git1
+
 * Fri Dec 29 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update USB endianness patches
 

linux-2.6-compile-fixes.patch:
 linux-2.6.19.noarch/drivers/macintosh/via-pmu.c    |    1 
 linux-2.6.19.noarch/include/asm-i386/desc.h        |   28 ++++++++++-----------
 linux-2.6.19.noarch/include/asm-powerpc/io.h       |    1 
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c |    4 +++
 4 files changed, 20 insertions(+), 14 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- linux-2.6-compile-fixes.patch	29 Dec 2006 07:14:15 -0000	1.126
+++ linux-2.6-compile-fixes.patch	30 Dec 2006 03:33:59 -0000	1.127
@@ -142,17 +142,3 @@
  #endif
  
 
-drivers/macintosh/via-pmu-backlight.c: In function 'pmu_backlight_init':
-drivers/macintosh/via-pmu-backlight.c:150: error: too few arguments to function 'backlight_device_register'
-
---- linux-2.6.19.noarch/drivers/macintosh/via-pmu-backlight.c~	2006-12-29 01:41:24.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/macintosh/via-pmu-backlight.c	2006-12-29 01:41:28.000000000 -0500
-@@ -147,7 +147,7 @@ void __init pmu_backlight_init()
- 
- 	snprintf(name, sizeof(name), "pmubl");
- 
--	bd = backlight_device_register(name, NULL, &pmu_backlight_data);
-+	bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data);
- 	if (IS_ERR(bd)) {
- 		printk("pmubl: Backlight registration failed\n");
- 		goto error;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- sources	29 Dec 2006 06:06:49 -0000	1.519
+++ sources	30 Dec 2006 03:33:59 -0000	1.520
@@ -1,3 +1,4 @@
 93d8d8f6c51f3c01beadbae1aa1fd548  xen-11633.tar.bz2
 443c265b57e87eadc0c677c3acc37e20  linux-2.6.19.tar.bz2
 4faf72e4e70867a85dae6db27f98a78f  patch-2.6.20-rc2.bz2
+6989880aaf19d75fbad356446f5ddeb7  patch-2.6.20-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- upstream	29 Dec 2006 06:03:22 -0000	1.447
+++ upstream	30 Dec 2006 03:33:59 -0000	1.448
@@ -1,2 +1,3 @@
 linux-2.6.19.tar.bz2
 patch-2.6.20-rc2.bz2
+patch-2.6.20-rc2-git1.bz2