Merge "Merge google common 'android-3.18' into 'msm-3.18'" (495ed645) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/ABI/testing/sysfs-fs-f2fs

+36 −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>
		@@ -102,6 +114,12 @@ 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>
		@@ -122,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>
		@@ -138,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/davinci.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,10 @@ EnBW AM1808 based CMC board
		Required root node properties:
		- compatible = "enbw,cmc", "ti,da850;

		LEGO MINDSTORMS EV3 (AM1808 based)
		Required root node properties:
		- compatible = "lego,ev3", "ti,da850";

		Generic DaVinci Boards
		----------------------

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ karo Ka-Ro electronics GmbH
		keymile Keymile GmbH
		lacie LaCie
		lantiq Lantiq Semiconductor
		lego LEGO Systems A/S
		lenovo Lenovo Group Ltd.
		invn InvenSense Inc.
		isl Intersil

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 79
		SUBLEVEL = 88
		EXTRAVERSION =
		NAME = Diseased Newt

arch/arm/configs/apq8053_IoE-perf_defconfig

+3 −3

Original line number	Diff line number	Diff line
		@@ -595,6 +595,9 @@ CONFIG_CRYPTO_NULL=y
		CONFIG_CRYPTO_CTR=y
		CONFIG_CRYPTO_XCBC=y
		CONFIG_CRYPTO_MD4=y
		CONFIG_CRYPTO_SHA2_ARM_CE=y
		CONFIG_CRYPTO_AES_ARM_BS=y
		CONFIG_CRYPTO_AES_ARM_CE=y
		CONFIG_CRYPTO_TWOFISH=y
		CONFIG_CRYPTO_DEV_QCRYPTO=y
		CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
		@@ -603,7 +606,4 @@ CONFIG_CRYPTO_DEV_OTA_CRYPTO=y
		CONFIG_CRYPTO_DEV_QCOM_ICE=y
		CONFIG_ARM_CRYPTO=y
		CONFIG_CRYPTO_SHA1_ARM_NEON=y
		CONFIG_CRYPTO_SHA2_ARM_CE=y
		CONFIG_CRYPTO_SHA512_ARM_NEON=y
		CONFIG_CRYPTO_AES_ARM_BS=y
		CONFIG_CRYPTO_AES_ARM_CE=y