Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.9 commit in: /
Date: Thu, 27 Jun 2019 11:10:21
Message-Id: 1561633798.c1e2dc1d7758b655ec285bb4128862a2863eeea5.mpagano@gentoo
1 commit: c1e2dc1d7758b655ec285bb4128862a2863eeea5
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 27 11:09:58 2019 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 27 11:09:58 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c1e2dc1d
7
8 Linux patch 4.9.184
9
10 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
11
12 0000_README | 4 ++++
13 1183_linux-4.9.184.patch | 25 +++++++++++++++++++++++++
14 2 files changed, 29 insertions(+)
15
16 diff --git a/0000_README b/0000_README
17 index fd03898..0978678 100644
18 --- a/0000_README
19 +++ b/0000_README
20 @@ -775,6 +775,10 @@ Patch: 1182_linux-4.9.183.patch
21 From: http://www.kernel.org
22 Desc: Linux 4.9.183
23
24 +Patch: 1183_linux-4.9.184.patch
25 +From: http://www.kernel.org
26 +Desc: Linux 4.9.184
27 +
28 Patch: 1500_XATTR_USER_PREFIX.patch
29 From: https://bugs.gentoo.org/show_bug.cgi?id=470644
30 Desc: Support for namespace user.pax.* on tmpfs.
31
32 diff --git a/1183_linux-4.9.184.patch b/1183_linux-4.9.184.patch
33 new file mode 100644
34 index 0000000..0371911
35 --- /dev/null
36 +++ b/1183_linux-4.9.184.patch
37 @@ -0,0 +1,25 @@
38 +diff --git a/Makefile b/Makefile
39 +index e63ace93b67b..3b0dd4e90c44 100644
40 +--- a/Makefile
41 ++++ b/Makefile
42 +@@ -1,6 +1,6 @@
43 + VERSION = 4
44 + PATCHLEVEL = 9
45 +-SUBLEVEL = 183
46 ++SUBLEVEL = 184
47 + EXTRAVERSION =
48 + NAME = Roaring Lionus
49 +
50 +diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
51 +index d8c6b833f0ce..0c195b0f4216 100644
52 +--- a/net/ipv4/tcp_output.c
53 ++++ b/net/ipv4/tcp_output.c
54 +@@ -1185,7 +1185,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
55 + if (nsize < 0)
56 + nsize = 0;
57 +
58 +- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
59 ++ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) {
60 + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
61 + return -ENOMEM;
62 + }