Merge "Merge android-3.18.119 (0462616) into msm-3.18" (517cd300) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/Changes

+6 −11

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ o Gnu C 3.2 # gcc --version
		o Gnu make 3.80 # make --version
		o binutils 2.12 # ld -v
		o util-linux 2.10o # fdformat --version
		o module-init-tools 0.9.10 # depmod -V
		o kmod 13 # depmod -V
		o e2fsprogs 1.41.4 # e2fsck -V
		o jfsutils 1.1.3 # fsck.jfs -V
		o reiserfsprogs 3.6.3 # reiserfsck -V
		@@ -119,12 +119,6 @@ is not build with CONFIG_KALLSYMS and you have no way to rebuild and
		reproduce the Oops with that option, then you can still decode that Oops
		with ksymoops.

		Module-Init-Tools
		-----------------

		A new module loader is now in the kernel that requires module-init-tools
		to use. It is backward compatible with the 2.4.x series kernels.

		Mkinitrd
		--------

		@@ -302,14 +296,15 @@ Util-linux
		----------
		o <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>

		Kmod
		----
		o <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
		o <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>

		Ksymoops
		--------
		o <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>

		Module-Init-Tools
		-----------------
		o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>

		Mkinitrd
		--------
		o <https://code.launchpad.net/initrd-tools/main>

Documentation/filesystems/f2fs.txt

+11 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,11 @@ background_gc=%s Turn on/off cleaning operations, namely garbage
		Default value for this option is on. So garbage
		collection is on by default.
		disable_roll_forward Disable the roll-forward recovery routine
		discard Issue discard/TRIM commands when a segment is cleaned.
		norecovery Disable the roll-forward recovery routine, mounted read-
		only (i.e., -o ro,disable_roll_forward)
		discard/nodiscard Enable/disable real-time discard in f2fs, if discard is
		enabled, f2fs will issue discard/TRIM commands when a
		segment is cleaned.
		no_heap Disable heap-style segment allocation which finds free
		segments for data from the beginning of main area, while
		for node from the end of main area.
		@@ -120,8 +124,14 @@ active_logs=%u Support configuring the number of active logs. In the
		disable_ext_identify Disable the extension list configured by mkfs, so f2fs
		does not aware of cold files such as media files.
		inline_xattr Enable the inline xattrs feature.
		noinline_xattr Disable the inline xattrs feature.
		inline_data Enable the inline data feature: New created small(<~3.4k)
		files can be written into inode block.
		inline_dentry Enable the inline dir feature: data in new created
		directory entries can be written into inode block. The
		space of inode block which is used to store inline
		dentries is limited to ~3.4k.
		noinline_dentry Diable the inline dentry feature.
		flush_merge Merge concurrent cache_flush commands as much as possible
		to eliminate redundant command issues. If the underlying
		device handles the cache_flush command relatively slowly,

Documentation/filesystems/fscrypt.rst

0 → 100644

+626 −0

File added.

Preview size limit exceeded, changes collapsed.

Makefile

+2 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 115
		SUBLEVEL = 119
		EXTRAVERSION =
		NAME = Diseased Newt

		@@ -618,6 +618,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
		KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
		KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
		KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
		KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
		KBUILD_AFLAGS += $(call cc-option,-fno-PIE)

arch/arc/include/asm/page.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ typedef unsigned long pgtable_t;
		#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)

		/* Default Permissions for stack/heaps pages (Non Executable) */
		#define VM_DATA_DEFAULT_FLAGS (VM_READ \| VM_WRITE \| VM_MAYREAD \| VM_MAYWRITE)
		#define VM_DATA_DEFAULT_FLAGS (VM_READ \| VM_WRITE \| VM_MAYREAD \| VM_MAYWRITE \| VM_MAYEXEC)

		#define WANT_PAGE_VIRTUAL 1