- up to 4.9.208

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 07ea4ba01fa79e725c4e3faff7227d33ac038f4d..a595a0ee92c028f884584b22239f022b0d247eaa 100644 (file)
--- 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))

diff --git a/kernel.spec b/kernel.spec
index 08d319abc4fc4a1adb12cc7467c8e27a8b85ff50..02376a531098470a2a6749f7893207c83b672523 100644 (file)
--- 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