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

Commit 5c5bccb7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.13-rc4 into staging-next. 



We want the fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 24b3aa09 319e2e3f

CREDITS

+5 −0
Original line number Original line Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: Stanford, California 94305

S: USA

S: USA





N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

N: Randolph Chung

E: tausq@debian.org

E: tausq@debian.org

D: Linux/PA-RISC hacker

D: Linux/PA-RISC hacker

Documentation/DocBook/media/v4l/vidioc-expbuf.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -73,7 +73,8 @@ range from zero to the maximal number of valid planes for the currently active 
format. For the single-planar API, applications must set <structfield> plane

format. For the single-planar API, applications must set <structfield> plane

</structfield> to zero.  Additional flags may be posted in the <structfield>

</structfield> to zero.  Additional flags may be posted in the <structfield>

flags </structfield> field.  Refer to a manual for open() for details.

flags </structfield> field.  Refer to a manual for open() for details.

Currently only O_CLOEXEC is supported.  All other fields must be set to zero.

Currently only O_CLOEXEC, O_RDONLY, O_WRONLY, and O_RDWR are supported.  All

other fields must be set to zero.

In the case of multi-planar API, every plane is exported separately using

In the case of multi-planar API, every plane is exported separately using

multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>

multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>
@@ -170,8 +171,9 @@ multi-planar API. Otherwise this value must be set to zero. </entry> 
	    <entry>__u32</entry>

	    <entry>__u32</entry>

	    <entry><structfield>flags</structfield></entry>

	    <entry><structfield>flags</structfield></entry>

	    <entry>Flags for the newly created file, currently only <constant>

	    <entry>Flags for the newly created file, currently only <constant>

O_CLOEXEC </constant> is supported, refer to the manual of open() for more

O_CLOEXEC </constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY

details.</entry>

</constant>, and <constant>O_RDWR</constant> are supported, refer to the manual

of open() for more details.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>__s32</entry>

	    <entry>__s32</entry>

Documentation/assoc_array.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -164,10 +164,10 @@ This points to a number of methods, all of which need to be provided: 




 (4) Diff the index keys of two objects.

 (4) Diff the index keys of two objects.





	int (*diff_objects)(const void *a, const void *b);

	int (*diff_objects)(const void *object, const void *index_key);





     Return the bit position at which the index keys of two objects differ or

     Return the bit position at which the index key of the specified object

     -1 if they are the same.

     differs from the given index key or -1 if they are the same.









 (5) Free an object.

 (5) Free an object.

Documentation/device-mapper/cache.txt

+6 −4
Original line number Original line Diff line number Diff line
@@ -266,10 +266,12 @@ E.g. 
Invalidation is removing an entry from the cache without writing it

Invalidation is removing an entry from the cache without writing it

back.  Cache blocks can be invalidated via the invalidate_cblocks

back.  Cache blocks can be invalidated via the invalidate_cblocks

message, which takes an arbitrary number of cblock ranges.  Each cblock

message, which takes an arbitrary number of cblock ranges.  Each cblock

must be expressed as a decimal value, in the future a variant message

range's end value is "one past the end", meaning 5-10 expresses a range

that takes cblock ranges expressed in hexidecimal may be needed to

of values from 5 to 9.  Each cblock must be expressed as a decimal

better support efficient invalidation of larger caches.  The cache must

value, in the future a variant message that takes cblock ranges

be in passthrough mode when invalidate_cblocks is used.

expressed in hexidecimal may be needed to better support efficient

invalidation of larger caches.  The cache must be in passthrough mode

when invalidate_cblocks is used.





   invalidate_cblocks [<cblock>|<cblock begin>-<cblock end>]*

   invalidate_cblocks [<cblock>|<cblock begin>-<cblock end>]*

Documentation/devicetree/bindings/arm/omap/mpu.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -7,10 +7,18 @@ The MPU contain CPUs, GIC, L2 cache and a local PRCM. 
Required properties:

Required properties:

- compatible : Should be "ti,omap3-mpu" for OMAP3

- compatible : Should be "ti,omap3-mpu" for OMAP3

               Should be "ti,omap4-mpu" for OMAP4

               Should be "ti,omap4-mpu" for OMAP4

	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"

- ti,hwmods: "mpu"





Examples:

Examples:





- For an OMAP5 SMP system:



mpu {

    compatible = "ti,omap5-mpu";

    ti,hwmods = "mpu"

};



- For an OMAP4 SMP system:

- For an OMAP4 SMP system:





mpu {

mpu {