From: Sasha Levin Date: Mon, 18 Feb 2019 02:07:05 +0000 (-0500) Subject: patches for 4.4 X-Git-Tag: v3.18.135~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=360a83723c23ca4b892899c056530e74ac213d44;p=thirdparty%2Fkernel%2Fstable-queue.git patches for 4.4 Signed-off-by: Sasha Levin --- 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 index 00000000000..94fedb996be --- /dev/null +++ b/queue-4.4/documentation-network-reword-kernel-version-referenc.patch @@ -0,0 +1,31 @@ +From 5d9fb87c02ba6ddf15e1e597a70c89152d674ad9 Mon Sep 17 00:00:00 2001 +From: Mark Rustad +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 +Signed-off-by: Sasha Levin +--- + 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 + diff --git a/queue-4.4/series b/queue-4.4/series index fa120069f3a..4f2f189bbb0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -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