Commit 4ccb6aea authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f25d3847 093b995e

Documentation/DocBook/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
# list of DOCBOOKS.



DOCBOOKS := z8530book.xml  \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    kernel-hacking.xml kernel-locking.xml \

	    writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml scsi.xml \

	    sh.xml regulator.xml w1.xml \

	    sh.xml w1.xml \

	    writing_musb_glue_layer.xml



ifeq ($(DOCBOOKS),)

Documentation/PCI/pcieaer-howto.txt

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ After reboot with new kernel or insert the module, a device file named 


Then, you need a user space tool named aer-inject, which can be gotten

from:

    http://www.kernel.org/pub/linux/utils/pci/aer-inject/

    https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/



More information about aer-inject can be found in the document comes

with its source code.

Documentation/admin-guide/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -653,6 +653,9 @@ 
	cpuidle.off=1	[CPU_IDLE]

			disable the cpuidle sub-system



	cpufreq.off=1	[CPU_FREQ]

			disable the cpufreq sub-system



	cpu_init_udelay=N

			[X86] Delay for N microsec between assert and de-assert

			of APIC INIT to start processors.  This delay occurs
@@ -1183,6 +1186,12 @@ 
			functions that can be changed at run time by the

			set_graph_notrace file in the debugfs tracing directory.



	ftrace_graph_max_depth=<uint>

			[FTRACE] Used with the function graph tracer. This is

			the max depth it will trace into a function. This value

			can be changed at run time by the max_graph_depth file

			in the tracefs tracing directory. default: 0 (no limit)



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ stable kernels. 
|                |                 |                 |                             |

| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

Documentation/cgroup-v2.txt

+6 −5
Original line number Diff line number Diff line
@@ -1142,8 +1142,8 @@ used by the kernel. 


  pids.max



 A read-write single value file which exists on non-root cgroups.  The

 default is "max".

	A read-write single value file which exists on non-root

	cgroups.  The default is "max".



	Hard limit of number of processes.
@@ -1151,7 +1151,8 @@ used by the kernel. 


	A read-only single value file which exists on all cgroups.



 The number of processes currently in the cgroup and its descendants.

	The number of processes currently in the cgroup and its

	descendants.



Organisational operations are not blocked by cgroup policies, so it is

possible to have pids.current > pids.max.  This can be done by either