Merge branch 'v3.6-rc7' into tty-next (467a3ca5) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/ABI/testing/sysfs-block-rssd

+0 −21

Original line number	Original line	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		What: /sys/block/rssd*/status
	Date: April 2012		Date: April 2012
	KernelVersion: 3.4		KernelVersion: 3.4
	Contact: Asai Thambi S P <asamymuthupa@micron.com>		Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Indicates the status of the device.		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

Documentation/DocBook/media/v4l/controls.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3988,7 +3988,7 @@ interface and may change in the future.</para>
	from RGB to Y'CbCr color space.		from RGB to Y'CbCr color space.
	</entry>		</entry>
	</row>		</row>
	<row id = "v4l2-jpeg-chroma-subsampling">		<row>
	<entrytbl spanname="descr" cols="2">		<entrytbl spanname="descr" cols="2">
	<tbody valign="top">		<tbody valign="top">
	<row>		<row>

Documentation/DocBook/media/v4l/pixfmt.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry>
	<row id="V4L2-PIX-FMT-Y4">		<row id="V4L2-PIX-FMT-Y4">
	<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>		<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>
	<entry>'Y04 '</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>		the other bits are set to 0.</entry>
	</row>		</row>
	<row id="V4L2-PIX-FMT-Y6">		<row id="V4L2-PIX-FMT-Y6">
	<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>		<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>
	<entry>'Y06 '</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>		the other bits are set to 0.</entry>
	</row>		</row>
	</tbody>		</tbody>

Documentation/DocBook/media/v4l/v4l2.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark>
	&sub-g-tuner;		&sub-g-tuner;
	&sub-log-status;		&sub-log-status;
	&sub-overlay;		&sub-overlay;
			&sub-prepare-buf;
	&sub-qbuf;		&sub-qbuf;
	&sub-querybuf;		&sub-querybuf;
	&sub-querycap;		&sub-querycap;
	@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark>
	&sub-query-dv-preset;		&sub-query-dv-preset;
	&sub-query-dv-timings;		&sub-query-dv-timings;
	&sub-querystd;		&sub-querystd;
	&sub-prepare-buf;
	&sub-reqbufs;		&sub-reqbufs;
	&sub-s-hw-freq-seek;		&sub-s-hw-freq-seek;
	&sub-streamon;		&sub-streamon;

Original line number	Original line	Diff line number	Diff line
	@@ -142,13 +142,14 @@ KernelVersion: 3.4
	Contact: linux-mtd@lists.infradead.org		Contact: linux-mtd@lists.infradead.org
	Description:		Description:
	This allows the user to examine and adjust the criteria by which		This allows the user to examine and adjust the criteria by which
	mtd returns -EUCLEAN from mtd_read(). If the maximum number of		mtd returns -EUCLEAN from mtd_read() and mtd_read_oob(). If the
	bit errors that were corrected on any single region comprising		maximum number of bit errors that were corrected on any single
	an ecc step (as reported by the driver) equals or exceeds this		region comprising an ecc step (as reported by the driver) equals
	value, -EUCLEAN is returned. Otherwise, absent an error, 0 is		or exceeds this value, -EUCLEAN is returned. Otherwise, absent
	returned. Higher layers (e.g., UBI) use this return code as an		an error, 0 is returned. Higher layers (e.g., UBI) use this
	indication that an erase block may be degrading and should be		return code as an indication that an erase block may be
	scrutinized as a candidate for being marked as bad.		degrading and should be scrutinized as a candidate for being
			marked as bad.

	The initial value may be specified by the flash device driver.		The initial value may be specified by the flash device driver.
	If not, then the default value is ecc_strength.		If not, then the default value is ecc_strength.
	@@ -167,7 +168,7 @@ Description:
	block degradation, but high enough to avoid the consequences of		block degradation, but high enough to avoid the consequences of
	a persistent return value of -EUCLEAN on devices where sticky		a persistent return value of -EUCLEAN on devices where sticky
	bitflips occur. Note that if bitflip_threshold exceeds		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		Conversely, if bitflip_threshold is zero, -EUCLEAN is always
	returned, absent a hard error.		returned, absent a hard error.