rpms/kernel/devel patch-2.6.31-rc6-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.1111, 1.1112 kernel.spec, 1.1727, 1.1728 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.3, 1.4 sources, 1.1069, 1.1070 upstream, 1.983, 1.984 patch-2.6.31-rc6-git3.bz2.sign, 1.1, NONE

Chuck Ebbert cebbert at fedoraproject.org
Wed Aug 19 12:46:27 UTC 2009 

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-debug-vm-would-have-oomkilled.patch sources upstream 
Added Files:
	patch-2.6.31-rc6-git5.bz2.sign 
Removed Files:
	patch-2.6.31-rc6-git3.bz2.sign 
Log Message:
2.6.31-rc6-git5
Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2
  because upstream changes to oom-kill.c were all reverted.


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

iD8DBQBKi+n3yGugalF9Dw4RAmtPAJ9MrnT+S9WZG49Gxiey0YVOYXuf0gCfdmZF
Gd4a9i65mtKqTyWxP6K+/qk=
=YMyk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1111
retrieving revision 1.1112
diff -u -p -r1.1111 -r1.1112
--- .cvsignore	18 Aug 2009 17:38:10 -0000	1.1111
+++ .cvsignore	19 Aug 2009 12:46:26 -0000	1.1112
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git3.bz2
+patch-2.6.31-rc6-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1727
retrieving revision 1.1728
diff -u -p -r1.1727 -r1.1728
--- kernel.spec	18 Aug 2009 18:27:39 -0000	1.1727
+++ kernel.spec	19 Aug 2009 12:46:26 -0000	1.1728
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1998,6 +1998,11 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 19 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc6-git5
+- Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2
+  because upstream changes to oom-kill.c were all reverted.
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Fix up perf so that it builds docs now that they are fixed.
 - with_docs disables perf docs too. be warned. (logic is that the

linux-2.6-debug-vm-would-have-oomkilled.patch:
 kernel/sysctl.c |    9 +++++++++
 mm/oom_kill.c   |   13 +++++++++++++
 2 files changed, 22 insertions(+)

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-debug-vm-would-have-oomkilled.patch	8 Jul 2009 17:28:48 -0000	1.3
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	19 Aug 2009 12:46:27 -0000	1.4
@@ -1,18 +1,8 @@
-From a0e012e118c2b0eba399e213a7989fd2b880f8b7 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Wed, 8 Jul 2009 13:05:46 -0400
-Subject: [PATCH 5/6] fedora: linux-2.6-debug-vm-would-have-oomkilled.patch
-
----
- kernel/sysctl.c |    9 +++++++++
- mm/oom_kill.c   |   14 ++++++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 98e0232..0cfe3ab 100644
+index b2a2d68..3b132ee 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -73,6 +73,7 @@ extern int sysctl_overcommit_ratio;
+@@ -67,6 +67,7 @@ extern int sysctl_overcommit_ratio;
  extern int sysctl_panic_on_oom;
  extern int sysctl_oom_kill_allocating_task;
  extern int sysctl_oom_dump_tasks;
@@ -20,7 +10,7 @@ index 98e0232..0cfe3ab 100644
  extern int max_threads;
  extern int core_uses_pid;
  extern int suid_dumpable;
-@@ -1031,6 +1032,14 @@ static struct ctl_table vm_table[] = {
+@@ -861,6 +862,14 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -36,7 +26,7 @@ index 98e0232..0cfe3ab 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index 175a67a..4ab4bdb 100644
+index f255eda..3335a94 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -47,9 +37,9 @@ index 175a67a..4ab4bdb 100644
  static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
-@@ -328,6 +329,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
- 	if (!p->mm)
+@@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
  		return;
+ 	}
  
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
@@ -60,11 +50,10 @@ index 175a67a..4ab4bdb 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -355,6 +362,13 @@ static int oom_kill_task(struct task_struct *p)
- 		return 1;
- 	}
- 	task_unlock(p);
-+
+@@ -363,6 +370,12 @@ static int oom_kill_task(struct task_struct *p)
+ 			return 1;
+ 	} while_each_thread(g, q);
+ 
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
 +				task_pid_nr(p), p->comm);
@@ -74,6 +63,3 @@ index 175a67a..4ab4bdb 100644
  	__oom_kill_task(p, 1);
  
  	/*
--- 
-1.6.2.5
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1069
retrieving revision 1.1070
diff -u -p -r1.1069 -r1.1070
--- sources	18 Aug 2009 17:38:10 -0000	1.1069
+++ sources	19 Aug 2009 12:46:27 -0000	1.1070
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-67d0b1917a80534f0a7f3aa2c2897509  patch-2.6.31-rc6-git3.bz2
+6128f58fd777f9b64ea5c2fa13049021  patch-2.6.31-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -p -r1.983 -r1.984
--- upstream	18 Aug 2009 17:38:11 -0000	1.983
+++ upstream	19 Aug 2009 12:46:27 -0000	1.984
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git3.bz2
+patch-2.6.31-rc6-git5.bz2


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

More information about the fedora-extras-commits mailing list