Commit 4f30a536 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents 3b53ff15 1244bbb3

Documentation/networking/ip-sysctl.txt

+5 −8
Original line number Diff line number Diff line
@@ -133,14 +133,11 @@ min_adv_mss - INTEGER 


IP Fragmentation:



ipfrag_high_thresh - INTEGER

	Maximum memory used to reassemble IP fragments. When

	ipfrag_high_thresh bytes of memory is allocated for this purpose,

	the fragment handler will toss packets until ipfrag_low_thresh

	is reached. This also serves as a maximum limit to namespaces

	different from the initial one.



ipfrag_low_thresh - INTEGER

ipfrag_high_thresh - LONG INTEGER

	Maximum memory used to reassemble IP fragments.



ipfrag_low_thresh - LONG INTEGER

	(Obsolete since 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.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 70

SUBLEVEL = 71

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

arch/arc/configs/axs103_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

arch/arc/configs/axs103_smp_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set