rpms/kernel/devel .cvsignore, 1.623, 1.624 kernel-2.6.spec, 1.3196, 1.3197 linux-2.6-modsign-include.patch, 1.4, 1.5 sources, 1.587, 1.588 upstream, 1.510, 1.511 linux-2.6-futex-compat-fix.patch, 1.1, NONE linux-2.6-x86-fsc-interrupt-controller-quirk.patch, 1.1, NONE patch-2.6.22-rc3-git3.bz2.sign, 1.1, NONE

Dave Jones (davej) fedora-extras-commits at redhat.com
Fri Jun 1 23:34:50 UTC 2007 

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-modsign-include.patch 
	sources upstream 
Removed Files:
	linux-2.6-futex-compat-fix.patch 
	linux-2.6-x86-fsc-interrupt-controller-quirk.patch 
	patch-2.6.22-rc3-git3.bz2.sign 
Log Message:
* Fri Jun 01 2007 Dave Jones <davej at redhat.com>
- 2.6.22-rc3-git6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- .cvsignore	31 May 2007 18:04:40 -0000	1.623
+++ .cvsignore	1 Jun 2007 23:33:37 -0000	1.624
@@ -3,7 +3,5 @@
 temp-*
 kernel-2.6.21
 linux-2.6.21.tar.bz2
-patch-2.6.21.1.bz2
 patch-2.6.22-rc3.bz2
-patches.tar.bz2
-patch-2.6.22-rc3-git3.bz2
+patch-2.6.22-rc3-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3196
retrieving revision 1.3197
diff -u -r1.3196 -r1.3197
--- kernel-2.6.spec	31 May 2007 18:19:38 -0000	1.3196
+++ kernel-2.6.spec	1 Jun 2007 23:33:37 -0000	1.3197
@@ -381,14 +381,13 @@
 Source82: config-olpc-generic
 
 Patch00: patch-2.6.22-rc3.bz2
-Patch01: patch-2.6.22-rc3-git3.bz2
+Patch01: patch-2.6.22-rc3-git6.bz2
 Patch10: linux-2.6-utrace.patch
 Patch20: nouveau-drm.patch
 Patch30: linux-2.6-sysrq-c.patch
 Patch40: linux-2.6-x86-tune-generic.patch
 Patch50: linux-2.6-x86-vga-vidfail.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
-Patch80: linux-2.6-x86-fsc-interrupt-controller-quirk.patch
 Patch90: linux-2.6-x86-dell-hpet.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch110: linux-2.6-powerpc-slabalign.patch
@@ -432,7 +431,6 @@
 Patch490: linux-2.6-softlockup-disable.patch
 Patch500: linux-2.6-optimise-spinlock-debug.patch
 Patch510: linux-2.6-silence-noise.patch
-Patch520: linux-2.6-futex-compat-fix.patch
 Patch530: linux-2.6-libertas.diff
 Patch540: linux-2.6-olpc-touchpad.diff
 Patch560: linux-2.6-crap-sysfs-workaround.patch
@@ -863,7 +861,7 @@
 
 # Update to latest upstream.
 bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc3.bz2 | patch -p1 -F1 -s
-bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc3-git3.bz2 | patch -p1 -F1 -s
+bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc3-git6.bz2 | patch -p1 -F1 -s
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -889,8 +887,6 @@
 ApplyPatch linux-2.6-x86-vga-vidfail.patch
 # Suppress APIC errors on UP x86-64.
 ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
-# quirk for Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller
-ApplyPatch linux-2.6-x86-fsc-interrupt-controller-quirk.patch
 # Blacklist Dell Optiplex 320 from using the HPET
 ApplyPatch linux-2.6-x86-dell-hpet.patch
 
@@ -1020,8 +1016,6 @@
 ApplyPatch linux-2.6-optimise-spinlock-debug.patch
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
-# Fix up compat futexes.
-ApplyPatch linux-2.6-futex-compat-fix.patch
 
 # OLPC specific patches
 %if 0%{?olpc}
@@ -2057,6 +2051,9 @@
 %endif
 
 %changelog
+* Fri Jun 01 2007 Dave Jones <davej at redhat.com>
+- 2.6.22-rc3-git6
+
 * Thu May 31 2007 Dave Jones <davej at redhat.com>
 - 2.6.22-rc3-git3
 

linux-2.6-modsign-include.patch:

Index: linux-2.6-modsign-include.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-modsign-include.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-modsign-include.patch	28 Feb 2007 17:44:23 -0000	1.4
+++ linux-2.6-modsign-include.patch	1 Jun 2007 23:33:37 -0000	1.5
@@ -160,23 +160,28 @@
  
  #endif /* _ASM_M32R_MODULE_H */
  
-diff --git a/include/asm-m68k/module.h b/include/asm-m68k/module.h
-index c6d75af..ee98908 100644
---- a/include/asm-m68k/module.h
-+++ b/include/asm-m68k/module.h
-@@ -1,7 +1,12 @@
- #ifndef _ASM_M68K_MODULE_H
- #define _ASM_M68K_MODULE_H
- struct mod_arch_specific { };
+--- linux-2.6.21.noarch/include/asm-m68k/module.h~	2007-06-01 19:29:19.000000000 -0400
++++ linux-2.6.21.noarch/include/asm-m68k/module.h	2007-06-01 19:30:02.000000000 -0400
+@@ -4,6 +4,7 @@
+ struct mod_arch_specific {
+ 	struct m68k_fixup_info *fixup_start, *fixup_end;
+ };
 +#define MODULES_ARE_ELF32
+ 
+ #define MODULE_ARCH_INIT {				\
+ 	.fixup_start		= __start_fixup,	\
+@@ -13,7 +14,10 @@ struct mod_arch_specific {
  #define Elf_Shdr Elf32_Shdr
  #define Elf_Sym Elf32_Sym
  #define Elf_Ehdr Elf32_Ehdr
+-
 +#define Elf_Rel Elf32_Rel
 +#define Elf_Rela Elf32_Rela
 +#define ELF_R_TYPE(X)	ELF32_R_TYPE(X)
 +#define ELF_R_SYM(X)	ELF32_R_SYM(X)
- #endif /* _ASM_M68K_MODULE_H */
+ 
+ enum m68k_fixup_type {
+ 	m68k_fixup_memoffset,
 diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h
 index 399d03f..694f979 100644
 --- a/include/asm-mips/module.h


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- sources	31 May 2007 18:04:40 -0000	1.587
+++ sources	1 Jun 2007 23:33:37 -0000	1.588
@@ -1,4 +1,4 @@
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
 c4c368f173af267a564948065ffc1689  patch-2.6.21.1.bz2
 2e7d2943ed89c4676296374d8eaaacb6  patch-2.6.22-rc3.bz2
-75807baba39ff7d78f98e3f84717ec7f  patch-2.6.22-rc3-git3.bz2
+27df0468b0cf0329006229dc6bdd7a31  patch-2.6.22-rc3-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -r1.510 -r1.511
--- upstream	31 May 2007 18:04:40 -0000	1.510
+++ upstream	1 Jun 2007 23:33:37 -0000	1.511
@@ -1,3 +1,3 @@
 linux-2.6.21.tar.bz2
 patch-2.6.22-rc3.bz2
-patch-2.6.22-rc3-git3.bz2
+patch-2.6.22-rc3-git6.bz2


--- linux-2.6-futex-compat-fix.patch DELETED ---


--- linux-2.6-x86-fsc-interrupt-controller-quirk.patch DELETED ---


--- patch-2.6.22-rc3-git3.bz2.sign DELETED ---

More information about the fedora-extras-commits mailing list