Merge "Merge android-4.4.104 (8bc4213) into msm-4.4" (e525ef12) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -437,6 +437,8 @@ sysrq.txt
		- info on the magic SysRq key.
		target/
		- directory with info on generating TCM v4 fabric .ko modules
		tee.txt
		- info on the TEE subsystem and drivers
		this_cpu_ops.txt
		- List rationale behind and the way to use this_cpu operations.
		thermal/

Documentation/ABI/testing/sysfs-fs-f2fs

+42 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,18 @@ Description:
		Controls the dirty page count condition for the in-place-update
		policies.

		What: /sys/fs/f2fs/<disk>/min_hot_blocks
		Date: March 2017
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Controls the dirty page count condition for redefining hot data.

		What: /sys/fs/f2fs/<disk>/min_ssr_sections
		Date: October 2017
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Description:
		Controls the fee section threshold to trigger SSR allocation.

		What: /sys/fs/f2fs/<disk>/max_small_discards
		Date: November 2013
		Contact: "Jaegeuk Kim" <jaegeuk.kim@samsung.com>
		@@ -96,6 +108,18 @@ Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Controls the checkpoint timing.

		What: /sys/fs/f2fs/<disk>/idle_interval
		Date: January 2016
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Controls the idle timing.

		What: /sys/fs/f2fs/<disk>/iostat_enable
		Date: August 2017
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Description:
		Controls to enable/disable IO stat.

		What: /sys/fs/f2fs/<disk>/ra_nid_pages
		Date: October 2015
		Contact: "Chao Yu" <chao2.yu@samsung.com>
		@@ -116,6 +140,12 @@ Contact: "Shuoran Liu" <liushuoran@huawei.com>
		Description:
		Shows total written kbytes issued to disk.

		What: /sys/fs/f2fs/<disk>/feature
		Date: July 2017
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Shows all enabled features in current device.

		What: /sys/fs/f2fs/<disk>/inject_rate
		Date: May 2016
		Contact: "Sheng Yong" <shengyong1@huawei.com>
		@@ -132,7 +162,18 @@ What: /sys/fs/f2fs/<disk>/reserved_blocks
		Date: June 2017
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Description:
		Controls current reserved blocks in system.
		Controls target reserved blocks in system, the threshold
		is soft, it could exceed current available user space.

		What: /sys/fs/f2fs/<disk>/current_reserved_blocks
		Date: October 2017
		Contact: "Yunlong Song" <yunlong.song@huawei.com>
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Description:
		Shows current reserved blocks in system, it may be temporarily
		smaller than target_reserved_blocks, but will gradually
		increase to target_reserved_blocks when more free blocks are
		freed by user later.

		What: /sys/fs/f2fs/<disk>/gc_urgent
		Date: August 2017

Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		OP-TEE Device Tree Bindings

		OP-TEE is a piece of software using hardware features to provide a Trusted
		Execution Environment. The security can be provided with ARM TrustZone, but
		also by virtualization or a separate chip.

		We're using "linaro" as the first part of the compatible property for
		the reference implementation maintained by Linaro.

		* OP-TEE based on ARM TrustZone required properties:

		- compatible : should contain "linaro,optee-tz"

		- method : The method of calling the OP-TEE Trusted OS. Permitted
		values are:

		"smc" : SMC #0, with the register assignments specified
		in drivers/tee/optee/optee_smc.h

		"hvc" : HVC #0, with the register assignments specified
		in drivers/tee/optee/optee_smc.h



		Example:
		firmware {
		optee {
		compatible = "linaro,optee-tz";
		method = "smc";
		};
		};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ lacie LaCie
		lantiq Lantiq Semiconductor
		lenovo Lenovo Group Ltd.
		lg LG Corporation
		linaro Linaro Limited
		linux Linux-specific binding
		lsi LSI Corp. (LSI Logic)
		lltc Linear Technology Corporation

Documentation/ioctl/ioctl-number.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,7 @@ Code Seq#(hex) Include File Comments
		0xA3 80-8F Port ACL in development:
		<mailto:tlewis@mindspring.com>
		0xA3 90-9F linux/dtlk.h
		0xA4 00-1F uapi/linux/tee.h Generic TEE subsystem
		0xAA 00-3F linux/uapi/linux/userfaultfd.h
		0xAB 00-1F linux/nbd.h
		0xAC 00-1F linux/raw.h