[packages/kernel/LINUX_4_9] - up to 4.9.188

arekm arekm at pld-linux.org
Tue Aug 6 23:38:57 CEST 2019


commit d42736e7f24213c66b5a112f382580858d2b10ae
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Aug 6 23:38:46 2019 +0200

    - up to 4.9.188

 kernel-vserver-2.3.patch | 10 +++++++---
 kernel.spec              |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index fca142e1..35b6c3d1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define		rel		1
 %define		basever		4.9
-%define		postver		.187
+%define		postver		.188
 
 # 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:	24aa08a43c838efb5cade1cc369a7947
+# Patch0-md5:	aa00e932109b9513d49bd5b6456a7f0c
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b7986689..d64b4068 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -12712,12 +12712,16 @@ diff -NurpP --minimal linux-4.9.135/ipc/mqueue.c linux-4.9.135-vs2.3.9.8/ipc/mqu
  	} else if (S_ISDIR(mode)) {
  		inc_nlink(inode);
  		/* Some things misbehave if size == 0 on a directory */
-@@ -396,8 +404,11 @@ static void mqueue_evict_inode(struct in
- 
+@@ -402,6 +402,7 @@ static void mqueue_evict_inode(struct in
  	user = info->user;
  	if (user) {
+ 		unsigned long mq_bytes, mq_treesize;
 +		struct vx_info *vxi = info->vxi;
-+
+ 
+ 		/* Total amount of bytes accounted for the mqueue */
+ 		mq_treesize = info->attr.mq_maxmsg * sizeof(struct msg_msg) +
+@@ -413,6 +414,7 @@ static void mqueue_evict_inode(struct in
+ 
  		spin_lock(&mq_lock);
  		user->mq_bytes -= mq_bytes;
 +		vx_ipcmsg_sub(vxi, user, mq_bytes);
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list