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

Commit dca45ad8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core 



Merge reason: Move from the -rc3 to the almost-rc6 base.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 68c38fc3 cd5b8f87

Documentation/00-INDEX

+4 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ DocBook/ 
	- directory with DocBook templates etc. for kernel documentation.

HOWTO

	- the process and procedures of how to do Linux kernel development.

IO-mapping.txt

	- how to access I/O mapped memory from within device drivers.

IPMI.txt

	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.

IRQ-affinity.txt
@@ -84,6 +82,8 @@ blockdev/ 
	- info on block devices & drivers

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

bus-virt-phys-mapping.txt

	- how to access I/O mapped memory from within device drivers.

cachetlb.txt

	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/
@@ -168,6 +168,8 @@ initrd.txt 
	- how to use the RAM disk as an initial/temporary root filesystem.

input/

	- info on Linux input device support.

io-mapping.txt

	- description of io_mapping functions in linux/io-mapping.h

io_ordering.txt

	- info on ordering I/O writes to memory-mapped addresses.

ioctl/

Documentation/kernel-parameters.txt

+4 −2
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			If there are multiple matching configurations changing

			the same attribute, the last one is used.



	lmb=debug	[KNL] Enable lmb debug messages.

	memblock=debug	[KNL] Enable memblock debug messages.



	load_ramdisk=	[RAM] List of ramdisks to load from floppy

			See Documentation/blockdev/ramdisk.txt.
@@ -2048,7 +2048,9 @@ and is between 256 and 4096 characters. It is defined in the file 
			WARNING: Forcing ASPM on may cause system lockups.



	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:

		off	Do not use native PCIe PME signaling.

			Format: {auto|force}[,nomsi]

		auto	Use native PCIe PME signaling if the BIOS allows the

			kernel to control PCIe config registers of root ports.

		force	Use native PCIe PME signaling even if the BIOS refuses

			to allow the kernel to control the relevant PCIe config

			registers.

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05 
tuner=82 - Philips CU1216L

tuner=83 - NXP TDA18271

tuner=84 - Sony BTF-Pxn01Z

tuner=85 - Philips FQ1236 MK5

Documentation/watchdog/watchdog-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -125,6 +125,11 @@ ibmasr: 
nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

-------------------------------------------------

imx2_wdt:

timeout: Watchdog timeout in seconds (default 60 s)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

-------------------------------------------------

indydog:

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)