rpms/kernel/devel .cvsignore, 1.636, 1.637 kernel-2.6.spec, 1.3241, 1.3242 linux-2.6-sched-cfs.patch, 1.8, 1.9 sources, 1.601, 1.602 upstream, 1.523, 1.524

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-sched-cfs.patch sources 
	upstream 
Log Message:
* Fri Jun 29 2007 Dave Jones <davej at redhat.com>
- 2.6.22-rc6-git3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- .cvsignore	25 Jun 2007 23:52:56 -0000	1.636
+++ .cvsignore	29 Jun 2007 07:03:02 -0000	1.637
@@ -4,3 +4,4 @@
 kernel-2.6.21
 linux-2.6.21.tar.bz2
 patch-2.6.22-rc6.bz2
+patch-2.6.22-rc6-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3241
retrieving revision 1.3242
diff -u -r1.3241 -r1.3242
--- kernel-2.6.spec	29 Jun 2007 06:41:28 -0000	1.3241
+++ kernel-2.6.spec	29 Jun 2007 07:03:02 -0000	1.3242
@@ -413,6 +413,7 @@
 %else
 # Here should be only the patches up to the upstream canonical Linus tree.
 Patch00: patch-2.6.22-rc6.bz2
+Patch01: patch-2.6.22-rc6-git3.bz2
 %endif
 
 %if !%{nopatches}
@@ -900,6 +901,7 @@
 
 # Update to latest upstream.
 ApplyPatch patch-2.6.22-rc6.bz2
+ApplyPatch patch-2.6.22-rc6-git3.bz2
 
 %endif
 %if !%{nopatches}
@@ -2067,6 +2069,9 @@
 %endif
 
 %changelog
+* Fri Jun 29 2007 Dave Jones <davej at redhat.com>
+- 2.6.22-rc6-git3
+
 * Mon Jun 25 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.22-rc6
 - cfs update for -rc6

linux-2.6-sched-cfs.patch:

Index: linux-2.6-sched-cfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-sched-cfs.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-sched-cfs.patch	25 Jun 2007 23:52:57 -0000	1.8
+++ linux-2.6-sched-cfs.patch	29 Jun 2007 07:03:02 -0000	1.9
@@ -208,19 +208,6 @@
 +   iterators of the scheduling modules are used. The balancing code got
 +   quite a bit simpler as a result.
 +
-Index: linux/Makefile
-===================================================================
---- linux.orig/Makefile
-+++ linux/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = -rc6
-+EXTRAVERSION = -rc6-cfs-v18
- NAME = Holy Dancing Manatees, Batman!
- 
- # *DOCUMENTATION*
 Index: linux/arch/i386/kernel/smpboot.c
 ===================================================================
 --- linux.orig/arch/i386/kernel/smpboot.c


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- sources	25 Jun 2007 23:52:57 -0000	1.601
+++ sources	29 Jun 2007 07:03:02 -0000	1.602
@@ -1,2 +1,3 @@
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
 8bb087bc36b73dd523356fc6b0a5bd34  patch-2.6.22-rc6.bz2
+82692bf6f1625ea43c9bd2297998b1c0  patch-2.6.22-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- upstream	25 Jun 2007 23:52:57 -0000	1.523
+++ upstream	29 Jun 2007 07:03:02 -0000	1.524
@@ -1,2 +1,3 @@
 linux-2.6.21.tar.bz2
 patch-2.6.22-rc6.bz2
+patch-2.6.22-rc6-git3.bz2