Merge branch 'sh/stable-updates' (94a46d3c) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/filesystems/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ befs.txt
		- information about the BeOS filesystem for Linux.
		bfs.txt
		- info for the SCO UnixWare Boot Filesystem (BFS).
		ceph.txt
		- info for the Ceph Distributed File System
		cifs.txt
		- description of the CIFS filesystem.
		coda.txt

Documentation/filesystems/ceph.txt

+6 −5

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ Basic features include:

		* POSIX semantics
		* Seamless scaling from 1 to many thousands of nodes
		* High availability and reliability. No single points of failure.
		* High availability and reliability. No single point of failure.
		* N-way replication of data across storage nodes
		* Fast recovery from node failures
		* Automatic rebalancing of data on node addition/removal
		@@ -94,7 +94,7 @@ Mount Options

		wsize=X
		Specify the maximum write size in bytes. By default there is no
		maximu. Ceph will normally size writes based on the file stripe
		maximum. Ceph will normally size writes based on the file stripe
		size.

		rsize=X
		@@ -115,7 +115,7 @@ Mount Options
		number of entries in that directory.

		nocrc
		Disable CRC32C calculation for data writes. If set, the OSD
		Disable CRC32C calculation for data writes. If set, the storage node
		must rely on TCP's error correction to detect data corruption
		in the data payload.

		@@ -133,7 +133,8 @@ For more information on Ceph, see the home page at
		http://ceph.newdream.net/

		The Linux kernel client source tree is available at
		git://ceph.newdream.net/linux-ceph-client.git
		git://ceph.newdream.net/git/ceph-client.git
		git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git

		and the source for the full system is at
		git://ceph.newdream.net/ceph.git
		git://ceph.newdream.net/git/ceph.git

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>;
		...
		};

MAINTAINERS

+12 −2

Original line number	Diff line number	Diff line
		@@ -1443,7 +1443,7 @@ F: arch/powerpc/platforms/cell/

		CEPH DISTRIBUTED FILE SYSTEM CLIENT
		M: Sage Weil <sage@newdream.net>
		L: ceph-devel@lists.sourceforge.net
		L: ceph-devel@vger.kernel.org
		W: http://ceph.newdream.net/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
		S: Supported
		@@ -3083,6 +3083,7 @@ F: include/scsi/iscsi
		ISDN SUBSYSTEM
		M: Karsten Keil <isdn@linux-pingi.de>
		L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
		L: netdev@vger.kernel.org
		W: http://www.isdn4linux.de
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
		S: Maintained
		@@ -3269,6 +3270,16 @@ S: Maintained
		F: include/linux/kexec.h
		F: kernel/kexec.c

		KEYS/KEYRINGS:
		M: David Howells <dhowells@redhat.com>
		L: keyrings@linux-nfs.org
		S: Maintained
		F: Documentation/keys.txt
		F: include/linux/key.h
		F: include/linux/key-type.h
		F: include/keys/
		F: security/keys/

		KGDB
		M: Jason Wessel <jason.wessel@windriver.com>
		L: kgdb-bugreport@lists.sourceforge.net
		@@ -5423,7 +5434,6 @@ S: Maintained
		F: sound/soc/codecs/twl4030*

		TIPC NETWORK LAYER
		M: Per Liden <per.liden@ericsson.com>
		M: Jon Maloy <jon.maloy@ericsson.com>
		M: Allan Stephens <allan.stephens@windriver.com>
		L: tipc-discussion@lists.sourceforge.net

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 34
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION