From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A16A2138334 for ; Thu, 27 Jun 2019 11:09:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C480CE0856; Thu, 27 Jun 2019 11:09:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8A46E0856 for ; Thu, 27 Jun 2019 11:09:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52895346B56 for ; Thu, 27 Jun 2019 11:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6688606 for ; Thu, 27 Jun 2019 11:09:01 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1561633721.605ef7d16bf79a209ef374ac98de7d1c2ff6e72a.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.14 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1130_linux-4.14.131.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 605ef7d16bf79a209ef374ac98de7d1c2ff6e72a X-VCS-Branch: 4.14 Date: Thu, 27 Jun 2019 11:09:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d1d8366b-d92c-4bfc-974c-74d6794faa41 X-Archives-Hash: b204828cd9f0e6b8480ec702ef1deec5 commit: 605ef7d16bf79a209ef374ac98de7d1c2ff6e72a Author: Mike Pagano gentoo org> AuthorDate: Thu Jun 27 11:08:41 2019 +0000 Commit: Mike Pagano gentoo org> CommitDate: Thu Jun 27 11:08:41 2019 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=605ef7d1 Linux patch 4.14.131 Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 ++++ 1130_linux-4.14.131.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/0000_README b/0000_README index 5805bb9..562acb4 100644 --- a/0000_README +++ b/0000_README @@ -563,6 +563,10 @@ Patch: 1129_linux-4.14.130.patch From: https://www.kernel.org Desc: Linux 4.14.130 +Patch: 1130_linux-4.14.131.patch +From: https://www.kernel.org +Desc: Linux 4.14.131 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1130_linux-4.14.131.patch b/1130_linux-4.14.131.patch new file mode 100644 index 0000000..167fb1b --- /dev/null +++ b/1130_linux-4.14.131.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 9d0715c300b1..275343cf27f7 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 4 + PATCHLEVEL = 14 +-SUBLEVEL = 130 ++SUBLEVEL = 131 + EXTRAVERSION = + NAME = Petit Gorille + +diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c +index a8772e11dc1c..a5960b9b6741 100644 +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1274,7 +1274,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, + if (nsize < 0) + nsize = 0; + +- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { ++ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); + return -ENOMEM; + }