commit af9853d88b6f6a8fa3c4ec6c81849a4ee0ee380e
Author: Jan Rękorajski <[email protected]>
Date: Sat Feb 9 10:46:28 2019 +0100
- 4.4.174
kernel-vserver-2.3.patch | 2 +-
kernel.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e91bbd7c..dfff2778 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
%define rel 1
%define basever 4.4
-%define postver .172
+%define postver .174
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -124,7 +124,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: fee2e81b14dd7ea18a0084bd76d61b7a
+# Patch0-md5: ddf9330b69f2e9164873b8eb2d7ab2ac
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 75fcf49b..13d5116d 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -13048,9 +13048,9 @@ diff -NurpP --minimal linux-4.4.161/kernel/exit.c
linux-4.4.161-vs2.3.9.8/kernel
#include <linux/hw_breakpoint.h>
#include <linux/oom.h>
@@ -456,14 +460,24 @@ static struct task_struct *find_child_re
- {
struct pid_namespace *pid_ns = task_active_pid_ns(father);
struct task_struct *reaper = pid_ns->child_reaper;
+ struct task_struct *p, *n;
+ struct vx_info *vxi = task_get_vx_info(father);
+
+ if (vxi) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/af9853d88b6f6a8fa3c4ec6c81849a4ee0ee380e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
