commit bc6416242220d3fc039ceb706d17ac05cdb7d489
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Feb 7 14:07:36 2019 +0100
- up to 4.9.155
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 9802e4aa..e6b2ec28 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
%define rel 1
%define basever 4.9
-%define postver .153
+%define postver .155
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -125,7 +125,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: e3b72ec1922ac8a110ffbfbf4997c114
+# Patch0-md5: 70059f65c0d2f8709735d7b998a64bfd
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 261553bf..e2db62d5 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -13036,9 +13036,9 @@ diff -NurpP --minimal linux-4.9.135/kernel/exit.c
linux-4.9.135-vs2.3.9.8/kernel
#include <linux/hw_breakpoint.h>
#include <linux/oom.h>
@@ -531,14 +535,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/bc6416242220d3fc039ceb706d17ac05cdb7d489
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
