]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
patches for 4.4
authorSasha Levin <sashal@kernel.org>
Mon, 18 Feb 2019 02:07:05 +0000 (21:07 -0500)
committerSasha Levin <sashal@kernel.org>
Mon, 18 Feb 2019 02:07:05 +0000 (21:07 -0500)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-4.4/documentation-network-reword-kernel-version-referenc.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/documentation-network-reword-kernel-version-referenc.patch b/queue-4.4/documentation-network-reword-kernel-version-referenc.patch
new file mode 100644 (file)
index 0000000..94fedb9
--- /dev/null
@@ -0,0 +1,31 @@
+From 5d9fb87c02ba6ddf15e1e597a70c89152d674ad9 Mon Sep 17 00:00:00 2001
+From: Mark Rustad <mrustad@gmail.com>
+Date: Fri, 15 Feb 2019 08:19:55 -0800
+Subject: Documentation/network: reword kernel version reference
+
+It seemed odd to say "since 4.17" in a 4.4 kernel. Consider
+rewording the reference to indicate where in the stable series
+it was introduced as well as where it originated.
+
+Signed-off-by: Mark Rustad <mrustad@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ Documentation/networking/ip-sysctl.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
+index 7c229f59016f..2fb35658d151 100644
+--- a/Documentation/networking/ip-sysctl.txt
++++ b/Documentation/networking/ip-sysctl.txt
+@@ -116,7 +116,7 @@ ipfrag_high_thresh - LONG INTEGER
+       Maximum memory used to reassemble IP fragments.
+ ipfrag_low_thresh - LONG INTEGER
+-      (Obsolete since linux-4.17)
++      (Obsolete since linux-4.4.174, backported from linux-4.17)
+       Maximum memory used to reassemble IP fragments before the kernel
+       begins to remove incomplete fragment queues to free up resources.
+       The kernel still accepts new fragments for defragmentation.
+-- 
+2.19.1
+
index fa120069f3a5160f0d9ce1882f7a381675e1661e..4f2f189bbb0ab1bad47fdd3693875d78846046e7 100644 (file)
@@ -121,3 +121,4 @@ arm-dts-da850-evm-correct-the-sound-card-name.patch
 arm-dts-kirkwood-fix-polarity-of-gpio-fan-lines.patch
 gpio-pl061-handle-failed-allocations.patch
 cifs-limit-memory-used-by-lock-request-calls-to-a-pa.patch
+documentation-network-reword-kernel-version-referenc.patch