[packages/kernel/LINUX_4_9] - up to 4.9.208

arekm arekm at pld-linux.org
Sat Jan 4 19:06:54 CET 2020


commit 3f7e6b2c1fe58c3e20fd740e13843494ae1475e6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Jan 4 19:04:43 2020 +0100

    - up to 4.9.208

 kernel-vserver-2.3.patch | 4 ++--
 kernel.spec              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 08d319ab..02376a53 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		2
+%define		rel		1
 %define		basever		4.9
-%define		postver		.207
+%define		postver		.208
 
 # 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:	01908476ba61f365ced94ee21b1cdd87
+# Patch0-md5:	dfdf4b6961d44244515fb1731ddf1f53
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 07ea4ba0..a595a0ee 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -23721,9 +23721,9 @@ diff -NurpP --minimal linux-4.9.135/net/ipv4/tcp_ipv4.c linux-4.9.135-vs2.3.9.8/
 --- linux-4.9.135/net/ipv4/tcp_ipv4.c	2018-10-20 10:39:25.000000000 +0000
 +++ linux-4.9.135-vs2.3.9.8/net/ipv4/tcp_ipv4.c	2018-10-20 05:55:44.000000000 +0000
 @@ -1933,8 +1933,12 @@ get_head:
- 	sk = sk_next(sk);
+ 	sk = sk_nulls_next(sk);
  get_sk:
- 	sk_for_each_from(sk) {
+ 	sk_nulls_for_each_from(sk, node) {
 +		vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
 +			sk, sk->sk_nid, nx_current_nid());
  		if (!net_eq(sock_net(sk), net))
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list