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

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -96,3 +96,6 @@ x509.genkey

		# Kconfig presets
		all.config

		# fetched Android config fragments
		android/configs/android-*.cfg

Documentation/ABI/testing/sysfs-fs-f2fs

+12 −0

Original line number	Diff line number	Diff line
		@@ -139,3 +139,15 @@ Date: June 2017
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Description:
		Controls current reserved blocks in system.

		What: /sys/fs/f2fs/<disk>/gc_urgent
		Date: August 2017
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Do background GC agressively

		What: /sys/fs/f2fs/<disk>/gc_urgent_sleep_time
		Date: August 2017
		Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
		Description:
		Controls sleep time of GC urgent mode

Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		THS8135 Video DAC
		-----------------

		This is the binding for Texas Instruments THS8135 Video DAC bridge.

		Required properties:

		- compatible: Must be "ti,ths8135"

		Required nodes:

		This device has two video ports. Their connections are modelled using the OF
		graph bindings specified in Documentation/devicetree/bindings/graph.txt.

		- Video port 0 for RGB input
		- Video port 1 for VGA output

		Example
		-------

		vga-bridge {
		compatible = "ti,ths8135";
		#address-cells = <1>;
		#size-cells = <0>;

		ports {
		#address-cells = <1>;
		#size-cells = <0>;

		port@0 {
		reg = <0>;

		vga_bridge_in: endpoint {
		remote-endpoint = <&lcdc_out_vga>;
		};
		};

		port@1 {
		reg = <1>;

		vga_bridge_out: endpoint {
		remote-endpoint = <&vga_con_in>;
		};
		};
		};
		};

Documentation/filesystems/f2fs.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,16 @@ io_bits=%u Set the bit size of write IO requests. It should be set
		with "mode=lfs".
		usrquota Enable plain user disk quota accounting.
		grpquota Enable plain group disk quota accounting.
		prjquota Enable plain project quota accounting.
		usrjquota=<file> Appoint specified file and type during mount, so that quota
		grpjquota=<file> information can be properly updated during recovery flow,
		prjjquota=<file> <quota file>: must be in root directory;
		jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1].
		offusrjquota Turn off user journelled quota.
		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.

		================================================================================
		DEBUGFS ENTRIES
		@@ -196,6 +206,15 @@ Files in /sys/fs/f2fs/<devname>
		gc_idle = 1 will select the Cost Benefit approach
		& setting gc_idle = 2 will select the greedy aproach.

		gc_urgent This parameter controls triggering background GCs
		urgently or not. Setting gc_urgent = 0 [default]
		makes back to default behavior, while if it is set
		to 1, background thread starts to do GC by given
		gc_urgent_sleep_time interval.

		gc_urgent_sleep_time This parameter controls sleep time for gc_urgent.
		500 ms is set by default. See above gc_urgent.

		reclaim_segments This parameter controls the number of prefree
		segments to be reclaimed. If the number of prefree
		segments is larger than the number of segments

Makefile

+1 −1

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