rpms/kernel/devel git-linus.diff, 1.11, 1.12 kernel.spec, 1.1013, 1.1014

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10536

Modified Files:
	git-linus.diff kernel.spec 
Log Message:
Update to the latest git (2 patches.)

git-linus.diff:

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git-linus.diff	24 Sep 2008 21:18:20 -0000	1.11
+++ git-linus.diff	4 Oct 2008 23:51:13 -0000	1.12
@@ -0,0 +1,59 @@
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Sat, 4 Oct 2008 19:15:13 +0000 (-0700)
+Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel ...
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0
+
+Merge branch 'timers-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip
+
+* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
+  clockevents: check broadcast tick device not the clock events device
+---
+
+diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
+index bd70345..cb01cd8 100644
+--- a/kernel/time/tick-broadcast.c
++++ b/kernel/time/tick-broadcast.c
+@@ -235,7 +235,8 @@ static void tick_do_broadcast_on_off(void *why)
+ 	case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:
+ 		if (!cpu_isset(cpu, tick_broadcast_mask)) {
+ 			cpu_set(cpu, tick_broadcast_mask);
+-			if (bc->mode == TICKDEV_MODE_PERIODIC)
++			if (tick_broadcast_device.mode ==
++			    TICKDEV_MODE_PERIODIC)
+ 				clockevents_shutdown(dev);
+ 		}
+ 		if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
+@@ -245,7 +246,8 @@ static void tick_do_broadcast_on_off(void *why)
+ 		if (!tick_broadcast_force &&
+ 		    cpu_isset(cpu, tick_broadcast_mask)) {
+ 			cpu_clear(cpu, tick_broadcast_mask);
+-			if (bc->mode == TICKDEV_MODE_PERIODIC)
++			if (tick_broadcast_device.mode ==
++			    TICKDEV_MODE_PERIODIC)
+ 				tick_setup_periodic(dev, 0);
+ 		}
+ 		break;
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Sat, 4 Oct 2008 19:14:46 +0000 (-0700)
+Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git ...
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b8ec322784f732562902503d70bf1f5e907b28c0
+
+Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip
+
+* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
+  x86 setup: correct segfault in generation of 32-bit reloc kernel
+---
+
+diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
+index a1310c5..857e492 100644
+--- a/arch/x86/boot/compressed/relocs.c
++++ b/arch/x86/boot/compressed/relocs.c
+@@ -492,7 +492,7 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
+ 			continue;
+ 		}
+ 		sh_symtab = sec_symtab->symtab;
+-		sym_strtab = sec->link->strtab;
++		sym_strtab = sec_symtab->link->strtab;
+ 		for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
+ 			Elf32_Rel *rel;
+ 			Elf32_Sym *sym;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -r1.1013 -r1.1014
--- kernel.spec	4 Oct 2008 23:46:39 -0000	1.1013
+++ kernel.spec	4 Oct 2008 23:51:14 -0000	1.1014
@@ -998,7 +998,7 @@
   done
 %endif
 
-#ApplyPatch git-linus.diff
+ApplyPatch git-linus.diff
 
 # 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
@@ -1778,6 +1778,9 @@
 
 %changelog
 * Sat Oct 04 2008 Chuck Ebbert <cebbert at redhat.com>
+- Update to the latest git (2 patches.)
+
+* Sat Oct 04 2008 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.27-rc8-git7
 
 * Sat Oct 04 2008 Chuck Ebbert <cebbert at redhat.com>