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

Commit f29135ee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge v4.18-rc3 into drm-next 



Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents eab97669 021c9179

Documentation/admin-guide/pm/intel_pstate.rst

+13 −3
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``
@@ -410,7 +420,7 @@ argument is passed to the kernel in the command line. 
	That only is supported in some configurations, though (for example, if

	the `HWP feature is enabled in the processor <Active Mode With HWP_>`_,

	the operation mode of the driver cannot be changed), and if it is not

	supported in the current configuration, writes to this attribute with

	supported in the current configuration, writes to this attribute will

	fail with an appropriate error.



Interpretation of Policy Attributes

Documentation/core-api/kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ Resources Management 
MTRR Handling

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



.. kernel-doc:: arch/x86/kernel/cpu/mtrr/main.c

.. kernel-doc:: arch/x86/kernel/cpu/mtrr/mtrr.c

   :export:



Security Framework

Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Spreadtrum SC27xx PMIC Vibrator



Required properties:

- compatible: should be "sprd,sc2731-vibrator".

- reg: address of vibrator control register.



Example :



	sc2731_pmic: pmic@0 {

		compatible = "sprd,sc2731";

		reg = <0>;

		spi-max-frequency = <26000000>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-controller;

		#interrupt-cells = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		vibrator@eb4 {

			compatible = "sprd,sc2731-vibrator";

			reg = <0xeb4>;

		};

	};

Documentation/driver-api/infrastructure.rst

+2 −2
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ Device Drivers Base 
Device Drivers DMA Management

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



.. kernel-doc:: drivers/base/dma-coherent.c

.. kernel-doc:: kernel/dma/coherent.c

   :export:



.. kernel-doc:: drivers/base/dma-mapping.c

.. kernel-doc:: kernel/dma/mapping.c

   :export:



Device drivers PnP support

Documentation/filesystems/Locking

+1 −6
Original line number Diff line number Diff line
@@ -441,8 +441,6 @@ prototypes: 
	int (*iterate) (struct file *, struct dir_context *);

	int (*iterate_shared) (struct file *, struct dir_context *);

	__poll_t (*poll) (struct file *, struct poll_table_struct *);

	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);

	__poll_t (*poll_mask) (struct file *, __poll_t);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

	int (*mmap) (struct file *, struct vm_area_struct *);
@@ -473,7 +471,7 @@ prototypes: 
};



locking rules:

	All except for ->poll_mask may block.

	All may block.



->llseek() locking has moved from llseek to the individual llseek

implementations.  If your fs is not using generic_file_llseek, you
@@ -505,9 +503,6 @@ in sys_read() and friends. 
the lease within the individual filesystem to record the result of the

operation



->poll_mask can be called with or without the waitqueue lock for the waitqueue

returned from ->get_poll_head.



--------------------------- dquot_operations -------------------------------

prototypes:

	int (*write_dquot) (struct dquot *);