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

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

Merge tag 'v3.5-rc7' into drm-next 



Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/radeon/radeon_gart.c
parents 83bc5fd2 84a1caf1

Documentation/ABI/testing/sysfs-block-rssd

+0 −21
Original line number Diff line number Diff line 
What:           /sys/block/rssd*/registers

Date:           March 2012

KernelVersion:  3.3

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps below driver information and

                hardware registers.

                    - S ACTive

                    - Command Issue

                    - Completed

                    - PORT IRQ STAT

                    - HOST IRQ STAT

                    - Allocated

                    - Commands in Q



What:           /sys/block/rssd*/status

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Indicates the status of the device.
 


What:           /sys/block/rssd*/flags

Date:           May 2012

KernelVersion:  3.5

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps the flags in port and driver

                data structure

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/pixfmt.xml

+2 −2
Original line number Diff line number Diff line
@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry> 
	  <row id="V4L2-PIX-FMT-Y4">

	    <entry><constant>V4L2_PIX_FMT_Y4</constant></entry>

	    <entry>'Y04 '</entry>

	    <entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used,

	    <entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used,

the other bits are set to 0.</entry>

	  </row>

	  <row id="V4L2-PIX-FMT-Y6">

	    <entry><constant>V4L2_PIX_FMT_Y6</constant></entry>

	    <entry>'Y06 '</entry>

	    <entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used,

	    <entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used,

the other bits are set to 0.</entry>

	  </row>

	</tbody>

Documentation/DocBook/media/v4l/v4l2.xml

+1 −1
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark> 
    &sub-g-tuner;

    &sub-log-status;

    &sub-overlay;

    &sub-prepare-buf;

    &sub-qbuf;

    &sub-querybuf;

    &sub-querycap;
@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark> 
    &sub-query-dv-preset;

    &sub-query-dv-timings;

    &sub-querystd;

    &sub-prepare-buf;

    &sub-reqbufs;

    &sub-s-hw-freq-seek;

    &sub-streamon;