Commit d2ce98ca authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'v4.18-rc6' into HEAD 

Pull bug fixes into the KVM development tree to avoid nasty conflicts.
parents 85eae57b d72e90f3

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -4846,3 +4846,8 @@ 
	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]



	xhci-hcd.quirks		[USB,KNL]

			A hex value specifying bitmask with supplemental xhci

			host controller quirks. Meaning of each bit can be

			consulted in header drivers/usb/host/xhci.h.

Documentation/admin-guide/pm/intel_pstate.rst

+12 −2
Original line number Diff line number Diff line
@@ -324,8 +324,7 @@ Global Attributes 


``intel_pstate`` exposes several global attributes (files) in ``sysfs`` to

control its functionality at the system level.  They are located in the

``/sys/devices/system/cpu/cpufreq/intel_pstate/`` directory and affect all

CPUs.

``/sys/devices/system/cpu/intel_pstate/`` directory and affect all CPUs.



Some of them are not present if the ``intel_pstate=per_cpu_perf_limits``

argument is passed to the kernel in the command line.
@@ -379,6 +378,17 @@ argument is passed to the kernel in the command line. 
	but it affects the maximum possible value of per-policy P-state	limits

	(see `Interpretation of Policy Attributes`_ below for details).



``hwp_dynamic_boost``

	This attribute is only present if ``intel_pstate`` works in the

	`active mode with the HWP feature enabled <Active Mode With HWP_>`_ in

	the processor.  If set (equal to 1), it causes the minimum P-state limit

	to be increased dynamically for a short time whenever a task previously

	waiting on I/O is selected to run on a given logical CPU (the purpose

	of this mechanism is to improve performance).



	This setting has no effect on logical CPUs whose minimum P-state limit

	is directly set to the highest non-turbo P-state or above it.



.. _status_attr:



``status``

Documentation/device-mapper/writecache.txt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ Constructor parameters: 
   size)

5. the number of optional parameters (the parameters with an argument

   count as two)

	start_sector n		(default: 0)

		offset from the start of cache device in 512-byte sectors

	high_watermark n	(default: 50)

		start writeback when the number of used blocks reach this

		watermark

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ Required root node properties: 
	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

				    Octa board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen4412    - for Exynos4412-based Insignal Origen board.

	- "insignal,origen4412"   - for Exynos4412-based Insignal Origen board.





Optional nodes:

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Optional nodes: 


 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.

   supports a single port with a single endpoint.



 - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and

   Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting