[packages/kernel/LINUX_4_9] - 4.9.135

baggins baggins at pld-linux.org
Thu Oct 25 21:18:15 CEST 2018


commit 627cd95b53d3d64473c7c0c903a2543b3d896013
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 25 21:17:59 2018 +0200

    - 4.9.135

 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 00566804..ae338629 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define		rel		1
 %define		basever		4.9
-%define		postver		.133
+%define		postver		.135
 
 # 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:	d0d7d52276953c4e35a4c105bc9e8608
+# Patch0-md5:	7432fed2908736cc45aa5f31fa191347
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 8e653bf9..4831ab61 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -6128,9 +6128,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/uptime.c linux-4.9.82-vs2.3.9.7/fs/pr
  #include <linux/time.h>
  #include <linux/kernel_stat.h>
 +#include <linux/vserver/cvirt.h>
- #include <linux/cputime.h>
  
  static int uptime_proc_show(struct seq_file *m, void *v)
+ {
 @@ -24,6 +25,10 @@ static int uptime_proc_show(struct seq_f
  	nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
  	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/627cd95b53d3d64473c7c0c903a2543b3d896013



More information about the pld-cvs-commit mailing list