Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next (0c4513be) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/DocBook/device-drivers.tmpl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
	<chapter id="uart16x50">		<chapter id="uart16x50">
	<title>16x50 UART Driver</title>		<title>16x50 UART Driver</title>
	!Edrivers/tty/serial/serial_core.c		!Edrivers/tty/serial/serial_core.c
	!Edrivers/tty/serial/8250/8250.c		!Edrivers/tty/serial/8250/8250_core.c
	</chapter>		</chapter>

	<chapter id="fbdev">		<chapter id="fbdev">

Documentation/kernel-parameters.txt

+40 −3

Original line number	Original line	Diff line number	Diff line
	@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	is selected automatically. Check		is selected automatically. Check
	Documentation/kdump/kdump.txt for further details.		Documentation/kdump/kdump.txt for further details.

	crashkernel_low=size[KMG]
	[KNL, x86] parts under 4G.

	crashkernel=range1:size1[,range2:size2,...][@offset]		crashkernel=range1:size1[,range2:size2,...][@offset]
	[KNL] Same as above, but depends on the memory		[KNL] Same as above, but depends on the memory
	in the running system. The syntax of range is		in the running system. The syntax of range is
	@@ -606,6 +603,26 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	a memory unit (amount[KMG]). See also		a memory unit (amount[KMG]). See also
	Documentation/kdump/kdump.txt for an example.		Documentation/kdump/kdump.txt for an example.

			crashkernel=size[KMG],high
			[KNL, x86_64] range could be above 4G. Allow kernel
			to allocate physical memory region from top, so could
			be above 4G if system have more than 4G ram installed.
			Otherwise memory region will be allocated below 4G, if
			available.
			It will be ignored if crashkernel=X is specified.
			crashkernel=size[KMG],low
			[KNL, x86_64] range under 4G. When crashkernel=X,high
			is passed, kernel could allocate physical memory region
			above 4G, that cause second kernel crash on system
			that require some amount of low memory, e.g. swiotlb
			requires at least 64M+32K low memory. Kernel would
			try to allocate 72M below 4G automatically.
			This one let user to specify own low range under 4G
			for second kernel instead.
			0: to disable low allocation.
			It will be ignored when crashkernel=X,high is not used
			or memory reserved is below 4G.

	cs89x0_dma= [HW,NET]		cs89x0_dma= [HW,NET]
	Format: <dma>		Format: <dma>

	@@ -788,6 +805,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	edd= [EDD]		edd= [EDD]
	Format: {"off" \| "on" \| "skip[mbr]"}		Format: {"off" \| "on" \| "skip[mbr]"}

			efi_no_storage_paranoia [EFI; X86]
			Using this parameter you can use more than 50% of
			your efi variable storage. Use this parameter only if
			you are really sure that your UEFI does sane gc and
			fulfills the spec otherwise your board may brick.

	eisa_irq_edge= [PARISC,HW]		eisa_irq_edge= [PARISC,HW]
	See header of drivers/parisc/eisa.c.		See header of drivers/parisc/eisa.c.

	@@ -1226,6 +1249,20 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

	iucv= [HW,NET]		iucv= [HW,NET]

			ivrs_ioapic [HW,X86_64]
			Provide an override to the IOAPIC-ID<->DEVICE-ID
			mapping provided in the IVRS ACPI table. For
			example, to map IOAPIC-ID decimal 10 to
			PCI device 00:14.0 write the parameter as:
			ivrs_ioapic[10]=00:14.0

			ivrs_hpet [HW,X86_64]
			Provide an override to the HPET-ID<->DEVICE-ID
			mapping provided in the IVRS ACPI table. For
			example, to map HPET-ID decimal 0 to
			PCI device 00:14.0 write the parameter as:
			ivrs_hpet[0]=00:14.0

	js= [HW,JOY] Analog joystick		js= [HW,JOY] Analog joystick
	See Documentation/input/joystick.txt.		See Documentation/input/joystick.txt.

Documentation/networking/ipvs-sysctl.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,13 @@ amemthresh - INTEGER
	enabled and the variable is automatically set to 2, otherwise		enabled and the variable is automatically set to 2, otherwise
	the strategy is disabled and the variable is set to 1.		the strategy is disabled and the variable is set to 1.

			backup_only - BOOLEAN
			0 - disabled (default)
			not 0 - enabled

			If set, disable the director function while the server is
			in backup mode to avoid packet loops for DR/TUN methods.

	conntrack - BOOLEAN		conntrack - BOOLEAN
	0 - disabled (default)		0 - disabled (default)
	not 0 - enabled		not 0 - enabled

Documentation/scsi/LICENSE.qla2xxx

+1 −1

Original line number	Original line	Diff line number	Diff line
	Copyright (c) 2003-2012 QLogic Corporation		Copyright (c) 2003-2013 QLogic Corporation
	QLogic Linux FC-FCoE Driver		QLogic Linux FC-FCoE Driver

	This program includes a device driver for Linux 3.x.		This program includes a device driver for Linux 3.x.

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -890,9 +890,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)		enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)
	power_save - Automatic power-saving timeout (in second, 0 =		power_save - Automatic power-saving timeout (in second, 0 =
	disable)		disable)
	power_save_controller - Support runtime D3 of HD-audio controller		power_save_controller - Reset HD-audio controller in power-saving mode
	(-1 = on for supported chip (default), false = off,		(default = on)
	true = force to on even for unsupported hardware)
	align_buffer_size - Force rounding of buffer/period sizes to multiples		align_buffer_size - Force rounding of buffer/period sizes to multiples
	of 128 bytes. This is more efficient in terms of memory		of 128 bytes. This is more efficient in terms of memory
	access but isn't required by the HDA spec and prevents		access but isn't required by the HDA spec and prevents