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

Commit c38b8343 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.128 (89904ccf) into msm-4.4"

parents 1c294945 0382cccf

Documentation/ABI/testing/sysfs-fs-f2fs

+11 −0
Original line number Diff line number Diff line
@@ -192,3 +192,14 @@ Date: November 2017 
Contact:	"Sheng Yong" <shengyong1@huawei.com>

Description:

		 Controls readahead inode block in readdir.



What:		/sys/fs/f2fs/<disk>/extension_list

Date:		Feburary 2018

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Used to control configure extension list:

		 - Query: cat /sys/fs/f2fs/<disk>/extension_list

		 - Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list

		 - Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list

		 - [h] means add/del hot file extension

		 - [c] means add/del cold file extension

Documentation/filesystems/f2fs.txt

+17 −0
Original line number Diff line number Diff line
@@ -172,6 +172,23 @@ offgrpjquota Turn off group journelled quota. 
offprjjquota           Turn off project journelled quota.

quota                  Enable plain user disk quota accounting.

noquota                Disable all plain disk quota option.

whint_mode=%s          Control which write hints are passed down to block

                       layer. This supports "off", "user-based", and

                       "fs-based".  In "off" mode (default), f2fs does not pass

                       down hints. In "user-based" mode, f2fs tries to pass

                       down hints given by users. And in "fs-based" mode, f2fs

                       passes down hints with its policy.

alloc_mode=%s          Adjust block allocation policy, which supports "reuse"

                       and "default".

fsync_mode=%s          Control the policy of fsync. Currently supports "posix"

                       and "strict". In "posix" mode, which is default, fsync

                       will follow POSIX semantics and does a light operation

                       to improve the filesystem performance. In "strict" mode,

                       fsync will be heavy and behaves in line with xfs, ext4

                       and btrfs, where xfstest generic/342 will pass, but the

                       performance will regress.

test_dummy_encryption  Enable dummy encryption, which provides a fake fscrypt

                       context. The fake fscrypt context is used by xfstests.



================================================================================

DEBUGFS ENTRIES

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 127

SUBLEVEL = 128

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/imx53-qsrb.dts

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
	imx53-qsrb {

		pinctrl_pmic: pmicgrp {

			fsl,pins = <

				MX53_PAD_CSI0_DAT5__GPIO5_23	0x1e4 /* IRQ */

				MX53_PAD_CSI0_DAT5__GPIO5_23	0x1c4 /* IRQ */

			>;

		};

	};

arch/arm/boot/dts/imx6qdl-wandboard.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
		clocks = <&clks 201>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

		lrclk-strength = <3>;

	};

};