rpms/kernel/devel patch-2.6.31-rc7-git1.bz2.sign, NONE, 1.1.2.2 patch-2.6.31-rc7.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.26, 1.1014.2.27 config-x86-generic, 1.68.6.18, 1.68.6.19 kernel.spec, 1.1294.2.55, 1.1294.2.56 sources, 1.976.2.27, 1.976.2.28 upstream, 1.888.2.26, 1.888.2.27 xen.pvops.post.patch, 1.1.2.22, 1.1.2.23 patch-2.6.31-rc6-git6.bz2.sign, 1.1.2.2, NONE patch-2.6.31-rc6.bz2.sign, 1.1.2.2, NONE

[myoung]

Author: myoung

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

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-x86-generic kernel.spec sources upstream 
	xen.pvops.post.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc7-git1.bz2.sign patch-2.6.31-rc7.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc6-git6.bz2.sign patch-2.6.31-rc6.bz2.sign 
Log Message:
disable stackprotector for i686 again to get a working pvops build



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

iD8DBQBKkIi+yGugalF9Dw4RAj3UAJ9ee5o5eKXr4H6lfjpEpm8dL9NkCwCfQkUP
sbX39sJV4yS7tmRYia54GKQ=
=CnYC
-----END PGP SIGNATURE-----


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

iD8DBQBKj0eHyGugalF9Dw4RAjSmAKCFx5UWyr47ufID24+cAt+aDkzuFQCcChR4
UL+Pz+UF1aRBLquOIQwNjJY=
=OJAQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.26
retrieving revision 1.1014.2.27
diff -u -p -r1.1014.2.26 -r1.1014.2.27
--- .cvsignore	20 Aug 2009 18:50:20 -0000	1.1014.2.26
+++ .cvsignore	24 Aug 2009 20:17:11 -0000	1.1014.2.27
@@ -5,5 +5,5 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git6.bz2
+patch-2.6.31-rc7.bz2
+patch-2.6.31-rc7-git1.bz2


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.18
retrieving revision 1.68.6.19
diff -u -p -r1.68.6.18 -r1.68.6.19
--- config-x86-generic	18 Aug 2009 19:26:45 -0000	1.68.6.18
+++ config-x86-generic	24 Aug 2009 20:17:11 -0000	1.68.6.19
@@ -115,7 +115,7 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR is not set
 
 CONFIG_SECCOMP=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.55
retrieving revision 1.1294.2.56
diff -u -p -r1.1294.2.55 -r1.1294.2.56
--- kernel.spec	20 Aug 2009 18:50:20 -0000	1.1294.2.55
+++ kernel.spec	24 Aug 2009 20:17:11 -0000	1.1294.2.56
@@ -60,9 +60,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 6
+%define rcrev 7
 # The git snapshot level
-%define gitrev 6
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -501,6 +501,10 @@ BuildRequires: elfutils-libelf-devel zli
 BuildRequires: dracut-kernel >= 0.7
 BuildRequires: dracut-generic >= 0.7
 %endif
+# For dracut image generation, cannot go in dracut package as its arch specific
+%ifnarch s390 s390x
+BuildRequires: kbd
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -2002,6 +2006,15 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 24 2009 Michael Young <m.a.young at durham.ac.uk>
+- turn off stackprotector on i686 for a clean build
+
+* Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git1
+
+* Sat Aug 22 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7
+
 * Thu Aug 20 2009 Michael Young <m.a.young at durham.ac.uk>
 - test a i686 stackprotector patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.27
retrieving revision 1.976.2.28
diff -u -p -r1.976.2.27 -r1.976.2.28
--- sources	20 Aug 2009 18:50:21 -0000	1.976.2.27
+++ sources	24 Aug 2009 20:17:12 -0000	1.976.2.28
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-bf8a969c68cb72946782195934e6f183  patch-2.6.31-rc6-git6.bz2
+4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
+22d1b4c17bde1034e332dc2505c9f15a  patch-2.6.31-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.26
retrieving revision 1.888.2.27
diff -u -p -r1.888.2.26 -r1.888.2.27
--- upstream	20 Aug 2009 18:50:21 -0000	1.888.2.26
+++ upstream	24 Aug 2009 20:17:12 -0000	1.888.2.27
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git6.bz2
+patch-2.6.31-rc7.bz2
+patch-2.6.31-rc7-git1.bz2

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/pci-swiotlb.c         |    5 ++---
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -p -r1.1.2.22 -r1.1.2.23
--- xen.pvops.post.patch	20 Aug 2009 18:50:23 -0000	1.1.2.22
+++ xen.pvops.post.patch	24 Aug 2009 20:17:12 -0000	1.1.2.23
@@ -84,31 +84,3 @@ index 6af96ee..1e66b18 100644
  #endif
  	if (xen_wants_swiotlb())
  		swiotlb = 1;
-diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 2e58099..3ebcbb2 100644
---- a/arch/x86/xen/enlighten.c
-+++ b/arch/x86/xen/enlighten.c
-@@ -51,6 +51,7 @@
- #include <asm/pgtable.h>
- #include <asm/tlbflush.h>
- #include <asm/reboot.h>
-+#include <asm/stackprotector.h>
- 
- #include "xen-ops.h"
- #include "mmu.h"
-@@ -1013,13 +1014,8 @@ asmlinkage void __init xen_start_kernel(void)
- 	pv_apic_ops = xen_apic_ops;
- 	pv_mmu_ops = xen_mmu_ops;
- 
--#ifdef CONFIG_X86_64
--	/*
--	 * Setup percpu state.  We only need to do this for 64-bit
--	 * because 32-bit already has %fs set properly.
--	 */
--	load_percpu_segment(0);
--#endif
-+	setup_stack_canary_segment(0);
-+	switch_to_new_gdt(0);
- 
- 	xen_init_irq_ops();
- 	xen_init_cpuid_mask();


--- patch-2.6.31-rc6-git6.bz2.sign DELETED ---


--- patch-2.6.31-rc6.bz2.sign DELETED ---