Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02735a29 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'at91/defconfig' into next/cleanup

parents 8d685b7f 3d911ad2

CREDITS

+6 −3
Original line number Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 


N: Kees Cook

E: kees@outflux.net

W: http://outflux.net/

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

D: Minor updates to SCSI types, added /proc/pid/maps protection

E: kees@ubuntu.com

E: keescook@chromium.org

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: Portland, Oregon

S: USA



N: Robin Cornelius

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ qcom Qualcomm, Inc. 
ramtron	Ramtron International

samsung	Samsung Semiconductor

schindler	Schindler

sil	Silicon Image

simtek

sirf	SiRF Technology, Inc.

stericsson	ST-Ericsson

Documentation/filesystems/btrfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ IRC network. 
Userspace tools for creating and manipulating Btrfs file systems are

available from the git repository at the following location:



 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git

 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git

 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git

 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git



These include the following tools:

Documentation/kernel-parameters.txt

+3 −3
Original line number Diff line number Diff line
@@ -315,12 +315,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			CPU-intensive style benchmark, and it can vary highly in

			a microbenchmark depending on workload and compiler.



			1: only for 32-bit processes

			2: only for 64-bit processes

			32: only for 32-bit processes

			64: only for 64-bit processes

			on: enable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes



	amd_iommu=	[HW,X86-84]

	amd_iommu=	[HW,X86-64]

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			fullflush - enable flushing of IO/TLB entries when

Documentation/networking/ip-sysctl.txt

+5 −5
Original line number Diff line number Diff line
@@ -282,11 +282,11 @@ tcp_max_ssthresh - INTEGER 
	Default: 0 (off)



tcp_max_syn_backlog - INTEGER

	Maximal number of remembered connection requests, which are

	still did not receive an acknowledgment from connecting client.

	Default value is 1024 for systems with more than 128Mb of memory,

	and 128 for low memory machines. If server suffers of overload,

	try to increase this number.

	Maximal number of remembered connection requests, which have not

	received an acknowledgment from connecting client.

	The minimal value is 128 for low memory machines, and it will

	increase in proportion to the memory of machine.

	If server suffers from overload, try increasing this number.



tcp_max_tw_buckets - INTEGER

	Maximal number of timewait sockets held by system simultaneously.