[packages/kernel/LINUX_4_9] - 4.9.136
baggins
baggins at pld-linux.org
Sun Nov 11 14:29:41 CET 2018
commit b65d880e29f51e755659c4c9faae03715d7c9505
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 11 14:29:26 2018 +0100
- 4.9.136
kernel-vserver-2.3.patch | 6 +++---
kernel.spec | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 3f162dbd..4882e8c2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
%define rel 1
%define basever 4.9
-%define postver .135
+%define postver .136
# 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: 7432fed2908736cc45aa5f31fa191347
+# Patch0-md5: c8543e103a1d5170904e261d05d181a8
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 9496a0e3..261553bf 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -24066,10 +24066,10 @@ diff -NurpP --minimal linux-4.9.135/net/ipv6/addrconf.c linux-4.9.135-vs2.3.9.8/
switch (type) {
@@ -4723,6 +4738,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
- if (++ip_idx < s_ip_idx)
- continue;
+ if (ip_idx < s_ip_idx)
+ goto next;
+ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
-+ continue;
++ goto next;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/b65d880e29f51e755659c4c9faae03715d7c9505
More information about the pld-cvs-commit
mailing list