rpms/kernel/devel .cvsignore, 1.206, 1.207 kernel-2.6.spec, 1.1510, 1.1511 linux-2.6-compile-fixes.patch, 1.28, 1.29 sources, 1.150, 1.151 upstream, 1.139, 1.140

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Log Message:
git1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- .cvsignore	24 Aug 2005 18:32:58 -0000	1.206
+++ .cvsignore	26 Aug 2005 02:39:52 -0000	1.207
@@ -7,3 +7,4 @@
 kernel-2.6.12
 linux-2.6.12.tar.bz2
 patch-2.6.13-rc7.bz2
+patch-2.6.13-rc7-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -r1.1510 -r1.1511
--- kernel-2.6.spec	25 Aug 2005 06:51:42 -0000	1.1510
+++ kernel-2.6.spec	26 Aug 2005 02:39:52 -0000	1.1511
@@ -215,7 +215,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.13-rc7.bz2
-Patch2: patch-2.6.13-rc6-git13.bz2
+Patch2: patch-2.6.13-rc7-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -539,7 +539,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1217,6 +1217,9 @@
 
 %changelog
 * Thu Aug 25 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-rc7-git1
+
+* Thu Aug 25 2005 Dave Jones <davej at redhat.com>
 - FUTEX_WAKE_OP support.
 
 * Tue Aug 23 2005 Dave Jones <davej at redhat.com>

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- linux-2.6-compile-fixes.patch	24 Aug 2005 19:31:07 -0000	1.28
+++ linux-2.6-compile-fixes.patch	26 Aug 2005 02:39:52 -0000	1.29
@@ -1,26 +0,0 @@
-drivers/macintosh/therm_pm72.ko needs unknown symbol machine_power_off
-
---- linux-2.6.12/arch/ppc64/kernel/setup.c~	2005-08-09 17:37:36.000000000 -0400
-+++ linux-2.6.12/arch/ppc64/kernel/setup.c	2005-08-09 17:37:53.000000000 -0400
-@@ -706,6 +706,7 @@ void machine_power_off(void)
- 	local_irq_disable();
- 	while (1) ;
- }
-+EXPORT_SYMBOL(machine_power_off);
- 
- void machine_halt(void)
- {
-
---- linux-2.6.12/kernel/cpuset.c~	2005-08-24 15:30:05.000000000 -0400
-+++ linux-2.6.12/kernel/cpuset.c	2005-08-24 15:30:27.000000000 -0400
-@@ -645,7 +645,9 @@ static void update_cpu_domains(struct cp
- 		int i, j;
- 
- 		for_each_cpu_mask(i, cur->cpus_allowed) {
--			for_each_cpu_mask(j, node_to_cpumask(cpu_to_node(i))) {
-+			cpumask_t mask = node_to_cpumask(cpu_to_node(i));
-+
-+			for_each_cpu_mask(j, mask) {
- 				if (!cpu_isset(j, cur->cpus_allowed))
- 					return;
- 			}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	24 Aug 2005 18:32:59 -0000	1.150
+++ sources	26 Aug 2005 02:39:52 -0000	1.151
@@ -1,2 +1,3 @@
 c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
 abc48891a152e7feefa69b0db835a024  patch-2.6.13-rc7.bz2
+b31b9753fe3033f649ba1e3d5d28b770  patch-2.6.13-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- upstream	24 Aug 2005 18:33:00 -0000	1.139
+++ upstream	26 Aug 2005 02:39:52 -0000	1.140
@@ -1,3 +1,3 @@
 linux-2.6.12.tar.bz2
 patch-2.6.13-rc7.bz2
-patch-2.6.13-rc6-git13.bz2
+patch-2.6.13-rc7-git1.bz2