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

Commit 2da994e6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'orion/devel' into next/devel

parents 00e92980 db33f4de

CREDITS

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




N: Kees Cook

N: Kees Cook

E: kees@outflux.net

E: kees@outflux.net

W: http://outflux.net/

E: kees@ubuntu.com

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

E: keescook@chromium.org

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

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: (ask for current address)

S: Portland, Oregon

S: USA

S: USA





N: Robin Cornelius

N: Robin Cornelius

Documentation/kernel-parameters.txt

+3 −3
Original line number Original line 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

			CPU-intensive style benchmark, and it can vary highly in

			a microbenchmark depending on workload and compiler.

			a microbenchmark depending on workload and compiler.





			1: only for 32-bit processes

			32: only for 32-bit processes

			2: only for 64-bit processes

			64: only for 64-bit processes

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

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

			off: disable 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.

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			Possible values are:

			fullflush - enable flushing of IO/TLB entries when

			fullflush - enable flushing of IO/TLB entries when

Documentation/networking/ip-sysctl.txt

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

	Default: 0 (off)





tcp_max_syn_backlog - INTEGER

tcp_max_syn_backlog - INTEGER

	Maximal number of remembered connection requests, which are

	Maximal number of remembered connection requests, which have not

	still did not receive an acknowledgment from connecting client.

	received an acknowledgment from connecting client.

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

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

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

	increase in proportion to the memory of machine.

	try to increase this number.

	If server suffers from overload, try increasing this number.





tcp_max_tw_buckets - INTEGER

tcp_max_tw_buckets - INTEGER

	Maximal number of timewait sockets held by system simultaneously.

	Maximal number of timewait sockets held by system simultaneously.

Documentation/sound/alsa/soc/machine.txt

+2 −4
Original line number Original line Diff line number Diff line
@@ -50,8 +50,7 @@ Machine DAI Configuration 
The machine DAI configuration glues all the codec and CPU DAIs together. It can

The machine DAI configuration glues all the codec and CPU DAIs together. It can

also be used to set up the DAI system clock and for any machine related DAI

also be used to set up the DAI system clock and for any machine related DAI

initialisation e.g. the machine audio map can be connected to the codec audio

initialisation e.g. the machine audio map can be connected to the codec audio

map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c

map, unconnected codec pins can be set as such.

for examples.





struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.

struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -83,8 +82,7 @@ Machine Power Map 
The machine driver can optionally extend the codec power map and to become an

The machine driver can optionally extend the codec power map and to become an

audio power map of the audio subsystem. This allows for automatic power up/down

audio power map of the audio subsystem. This allows for automatic power up/down

of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack

of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack

sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for

sockets in the machine init function.

details.









Machine Controls

Machine Controls

Documentation/usb/linux-cdc-acm.inf

+2 −2
Original line number Original line Diff line number Diff line
@@ -90,10 +90,10 @@ ServiceBinary=%12%\USBSER.sys 
[SourceDisksFiles]

[SourceDisksFiles]

[SourceDisksNames]

[SourceDisksNames]

[DeviceList]

[DeviceList]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00





[DeviceList.NTamd64]

[DeviceList.NTamd64]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00









;------------------------------------------------------------------------------

;------------------------------------------------------------------------------