Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued (aa18bc8d) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/ABI/testing/sysfs-bus-pci

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -299,5 +299,5 @@ What: /sys/bus/pci/devices/.../revision
	Date: November 2016		Date: November 2016
	Contact: Emil Velikov <emil.l.velikov@gmail.com>		Contact: Emil Velikov <emil.l.velikov@gmail.com>
	Description:		Description:
	This file contains the revision field of the the PCI device.		This file contains the revision field of the PCI device.
	The value comes from device config space. The file is read only.		The value comes from device config space. The file is read only.

Documentation/admin-guide/kernel-parameters.txt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -653,6 +653,9 @@
	cpuidle.off=1 [CPU_IDLE]		cpuidle.off=1 [CPU_IDLE]
	disable the cpuidle sub-system		disable the cpuidle sub-system

			cpufreq.off=1 [CPU_FREQ]
			disable the cpufreq sub-system

	cpu_init_udelay=N		cpu_init_udelay=N
	[X86] Delay for N microsec between assert and de-assert		[X86] Delay for N microsec between assert and de-assert
	of APIC INIT to start processors. This delay occurs		of APIC INIT to start processors. This delay occurs
	@@ -1183,6 +1186,12 @@
	functions that can be changed at run time by the		functions that can be changed at run time by the
	set_graph_notrace file in the debugfs tracing directory.		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]=		gamecon.map[2\|3]=
	[HW,JOY] Multisystem joystick and NES/SNES/PSX pad		[HW,JOY] Multisystem joystick and NES/SNES/PSX pad
	support via parallel port (up to 5 devices per port)		support via parallel port (up to 5 devices per port)

Documentation/admin-guide/security-bugs.rst

+34 −5

Original line number	Original line	Diff line number	Diff line
	@@ -14,14 +14,17 @@ Contact
	The Linux kernel security team can be contacted by email at		The Linux kernel security team can be contacted by email at
	<security@kernel.org>. This is a private list of security officers		<security@kernel.org>. This is a private list of security officers
	who will help verify the bug report and develop and release a fix.		who will help verify the bug report and develop and release a fix.
	It is possible that the security team will bring in extra help from		If you already have a fix, please include it with your report, as
	area maintainers to understand and fix the security vulnerability.		that can speed up the process considerably. It is possible that the
			security team will bring in extra help from area maintainers to
			understand and fix the security vulnerability.

	As it is with any bug, the more information provided the easier it		As it is with any bug, the more information provided the easier it
	will be to diagnose and fix. Please review the procedure outlined in		will be to diagnose and fix. Please review the procedure outlined in
	admin-guide/reporting-bugs.rst if you are unclear about what information is helpful.		admin-guide/reporting-bugs.rst if you are unclear about what
	Any exploit code is very helpful and will not be released without		information is helpful. Any exploit code is very helpful and will not
	consent from the reporter unless it has already been made public.		be released without consent from the reporter unless it has already been
			made public.

	Disclosure		Disclosure
	----------		----------
	@@ -39,6 +42,32 @@ disclosure is from immediate (esp. if it's already publicly known)
	to a few weeks. As a basic default policy, we expect report date to		to a few weeks. As a basic default policy, we expect report date to
	disclosure date to be on the order of 7 days.		disclosure date to be on the order of 7 days.

			Coordination
			------------

			Fixes for sensitive bugs, such as those that might lead to privilege
			escalations, may need to be coordinated with the private
			<linux-distros@vs.openwall.org> mailing list so that distribution vendors
			are well prepared to issue a fixed kernel upon public disclosure of the
			upstream fix. Distros will need some time to test the proposed patch and
			will generally request at least a few days of embargo, and vendor update
			publication prefers to happen Tuesday through Thursday. When appropriate,
			the security team can assist with this coordination, or the reporter can
			include linux-distros from the start. In this case, remember to prefix
			the email Subject line with "[vs]" as described in the linux-distros wiki:
			<http://oss-security.openwall.org/wiki/mailing-lists/distros#how-to-use-the-lists>

			CVE assignment
			--------------

			The security team does not normally assign CVEs, nor do we require them
			for reports or fixes, as this can needlessly complicate the process and
			may delay the bug handling. If a reporter wishes to have a CVE identifier
			assigned ahead of public disclosure, they will need to contact the private
			linux-distros list, described above. When such a CVE identifier is known
			before a patch is provided, it is desirable to mention it in the commit
			message, though.

	Non-disclosure agreements		Non-disclosure agreements
	-------------------------		-------------------------

Documentation/arm64/silicon-errata.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,3 +68,4 @@ stable kernels.
	\| \| \| \| \|		\| \| \| \| \|
	\| Qualcomm Tech. \| Falkor v1 \| E1003 \| QCOM_FALKOR_ERRATUM_1003 \|		\| Qualcomm Tech. \| Falkor v1 \| E1003 \| QCOM_FALKOR_ERRATUM_1003 \|
	\| Qualcomm Tech. \| Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|		\| 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	Original line	Diff line number	Diff line
	@@ -1142,8 +1142,8 @@ used by the kernel.

	pids.max		pids.max

	A read-write single value file which exists on non-root cgroups. The		A read-write single value file which exists on non-root
	default is "max".		cgroups. The default is "max".

	Hard limit of number of processes.		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.		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		Organisational operations are not blocked by cgroup policies, so it is
	possible to have pids.current > pids.max. This can be done by either		possible to have pids.current > pids.max. This can be done by either

Original line number	Original line	Diff line number	Diff line
	@@ -68,3 +68,4 @@ stable kernels.
	\| \| \| \| \|		\| \| \| \| \|
	\| Qualcomm Tech. \| Falkor v1 \| E1003 \| QCOM_FALKOR_ERRATUM_1003 \|		\| Qualcomm Tech. \| Falkor v1 \| E1003 \| QCOM_FALKOR_ERRATUM_1003 \|
	\| Qualcomm Tech. \| Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|		\| Qualcomm Tech. \| Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|
			\| Qualcomm Tech. \| QDF2400 ITS \| E0065 \| QCOM_QDF2400_ERRATUM_0065 \|