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

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

Merge branch 'linus' into perf/core 



Pick up the latest ring-buffer fixes, before applying a new fix.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c3b7cdf1 a0185401

Documentation/ABI/testing/sysfs-class-mtd

+9 −8
Original line number Diff line number Diff line
@@ -142,13 +142,14 @@ KernelVersion: 3.4 
Contact:	linux-mtd@lists.infradead.org

Description:

		This allows the user to examine and adjust the criteria by which

		mtd returns -EUCLEAN from mtd_read().  If the maximum number of

		bit errors that were corrected on any single region comprising

		an ecc step (as reported by the driver) equals or exceeds this

		value, -EUCLEAN is returned.  Otherwise, absent an error, 0 is

		returned.  Higher layers (e.g., UBI) use this return code as an

		indication that an erase block may be degrading and should be

		scrutinized as a candidate for being marked as bad.

		mtd returns -EUCLEAN from mtd_read() and mtd_read_oob().  If the

		maximum number of bit errors that were corrected on any single

		region comprising an ecc step (as reported by the driver) equals

		or exceeds this value, -EUCLEAN is returned.  Otherwise, absent

		an error, 0 is returned.  Higher layers (e.g., UBI) use this

		return code as an indication that an erase block may be

		degrading and should be scrutinized as a candidate for being

		marked as bad.



		The initial value may be specified by the flash device driver.

		If not, then the default value is ecc_strength.
@@ -167,7 +168,7 @@ Description: 
		block degradation, but high enough to avoid the consequences of

		a persistent return value of -EUCLEAN on devices where sticky

		bitflips occur.  Note that if bitflip_threshold exceeds

		ecc_strength, -EUCLEAN is never returned by mtd_read().

		ecc_strength, -EUCLEAN is never returned by the read operations.

		Conversely, if bitflip_threshold is zero, -EUCLEAN is always

		returned, absent a hard error.

Documentation/DocBook/media/v4l/controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3988,7 +3988,7 @@ interface and may change in the future.</para> 
	    from RGB to Y'CbCr color space.

	    </entry>

	  </row>

	  <row id = "v4l2-jpeg-chroma-subsampling">

	  <row>

	    <entrytbl spanname="descr" cols="2">

	      <tbody valign="top">

		<row>

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

+0 −7
Original line number Diff line number Diff line
@@ -284,13 +284,6 @@ These controls are described in <xref 
	    processing controls. These controls are described in <xref

	    linkend="image-process-controls" />.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>

	    <entry>0x9d0000</entry>

	    <entry>The class containing JPEG compression controls.

These controls are described in <xref

		linkend="jpeg-controls" />.</entry>

	  </row>

	</tbody>

      </tgroup>

    </table>

Documentation/devicetree/bindings/input/fsl-mma8450.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


Required properties:

- compatible : "fsl,mma8450".

- reg: the I2C address of MMA8450



Example:

Documentation/devicetree/bindings/mfd/mc13xxx.txt

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ Examples: 


ecspi@70010000 { /* ECSPI1 */

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */

		   <&gpio3 25 0>; /* GPIO4_25 */

	cs-gpios = <&gpio4 24 0>, /* GPIO4_24 */

		   <&gpio4 25 0>; /* GPIO4_25 */

	status = "okay";



	pmic: mc13892@0 {