Commit c25f7cf2 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096',... 

Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', 'bugzilla-15521', 'bugzilla-15605', 'gpe-reference-counters', 'misc', 'pxm-fix' and 'video-random-key' into release
parents f79e1cec dadf28a1 ac7729da 3162b6f0 bc73675b b7b30de5 bf02bd25 1638bca8 0f9b75ef 17c452f9

Documentation/connector/cn_test.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/timer.h>



#include <linux/connector.h>

Documentation/filesystems/9p.txt

+16 −2
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ For Plan 9 From User Space applications (http://swtch.com/plan9) 


	mount -t 9p `namespace`/acme /mnt/9 -o trans=unix,uname=$USER



For server running on QEMU host with virtio transport:



	mount -t 9p -o trans=virtio <mount_tag> /mnt/9



where mount_tag is the tag associated by the server to each of the exported

mount points. Each 9P export is seen by the client as a virtio device with an

associated "mount_tag" property. Available mount tags can be

seen by reading /sys/bus/virtio/drivers/9pnet_virtio/virtio<n>/mount_tag files.



OPTIONS

=======
@@ -47,7 +56,7 @@ OPTIONS 
			fd   	- used passed file descriptors for connection

                                (see rfdno and wfdno)

			virtio	- connect to the next virtio channel available

				(from lguest or KVM with trans_virtio module)

				(from QEMU with trans_virtio module)

			rdma	- connect to a specified RDMA channel



  uname=name	user name to attempt mount as on the remote server.  The
@@ -85,7 +94,12 @@ OPTIONS 


  port=n	port to connect to on the remote server



  noextend	force legacy mode (no 9p2000.u semantics)

  noextend	force legacy mode (no 9p2000.u or 9p2000.L semantics)



  version=name	Select 9P protocol version. Valid options are:

			9p2000          - Legacy mode (same as noextend)

			9p2000.u        - Use 9P2000.u protocol

			9p2000.L        - Use 9P2000.L protocol



  dfltuid	attempt to mount as a particular uid

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt

+54 −0
Original line number Diff line number Diff line
@@ -21,6 +21,15 @@ Required properties: 
- fsl,qe-num-snums: define how many serial number(SNUM) the QE can use for the

  threads.



Optional properties:

- fsl,firmware-phandle:

    Usage: required only if there is no fsl,qe-firmware child node

    Value type: <phandle>

    Definition: Points to a firmware node (see "QE Firmware Node" below)

        that contains the firmware that should be uploaded for this QE.

        The compatible property for the firmware node should say,

        "fsl,qe-firmware".



Recommended properties

- brg-frequency : the internal clock source frequency for baud-rate

  generators in Hz.
@@ -59,3 +68,48 @@ Example: 
		reg = <0 c000>;

	};

     };



* QE Firmware Node



This node defines a firmware binary that is embedded in the device tree, for

the purpose of passing the firmware from bootloader to the kernel, or from

the hypervisor to the guest.



The firmware node itself contains the firmware binary contents, a compatible

property, and any firmware-specific properties.  The node should be placed

inside a QE node that needs it.  Doing so eliminates the need for a

fsl,firmware-phandle property.  Other QE nodes that need the same firmware

should define an fsl,firmware-phandle property that points to the firmware node

in the first QE node.



The fsl,firmware property can be specified in the DTS (possibly using incbin)

or can be inserted by the boot loader at boot time.



Required properties:

  - compatible

      Usage: required

      Value type: <string>

      Definition: A standard property.  Specify a string that indicates what

          kind of firmware it is.  For QE, this should be "fsl,qe-firmware".



   - fsl,firmware

      Usage: required

      Value type: <prop-encoded-array>, encoded as an array of bytes

      Definition: A standard property.  This property contains the firmware

          binary "blob".



Example:

	qe1@e0080000 {

		compatible = "fsl,qe";

		qe_firmware:qe-firmware {

			compatible = "fsl,qe-firmware";

			fsl,firmware = [0x70 0xcd 0x00 0x00 0x01 0x46 0x45 ...];

		};

		...

	};



	qe2@e0090000 {

		compatible = "fsl,qe";

		fsl,firmware-phandle = <&qe_firmware>;

		...

	};

arch/alpha/boot/bootp.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * based significantly on the arch/alpha/boot/main.c of Linus Torvalds

 */

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <generated/utsrelease.h>

#include <linux/mm.h>

arch/alpha/boot/bootpz.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * and the decompression code from MILO.

 */

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <generated/utsrelease.h>

#include <linux/mm.h>