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

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

Merge "Merge google common 'android-3.18' into 'msm-3.18'"

parents 74153615 41af0494

Documentation/ABI/testing/sysfs-fs-f2fs

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,15 @@ Contact: "Jaegeuk Kim" <jaegeuk.kim@samsung.com> 
Description:

		 Controls the issue rate of small discard commands.



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

Date:          July 2017

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

Description:

		Controls discard granularity of inner discard thread, inner thread

		will not issue discards with size that is smaller than granularity.

		The unit size is one block, now only support configuring in range

		of [1, 512].



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

Date:		January 2014

Contact:	"Jaegeuk Kim" <jaegeuk.kim@samsung.com>

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 66

SUBLEVEL = 71

EXTRAVERSION =

NAME = Diseased Newt

android/configs/android-base.cfg

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y 
CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_RAW=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IPV6=y

arch/arm/mm/fault.c

+4 −1
Original line number Diff line number Diff line
@@ -319,8 +319,11 @@ retry: 
	 * signal first. We do not need to release the mmap_sem because

	 * it would already be released in __lock_page_or_retry in

	 * mm/filemap.c. */

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {

		if (!user_mode(regs))

			goto no_context;

		return 0;

	}



	/*

	 * Major/minor page fault accounting is only done on the

arch/arm64/kernel/fpsimd.c

+2 −0
Original line number Diff line number Diff line
@@ -202,9 +202,11 @@ void fpsimd_thread_switch(struct task_struct *next) 


void fpsimd_flush_thread(void)

{

	preempt_disable();

	memset(&current->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));

	fpsimd_flush_task_state(current);

	set_thread_flag(TIF_FOREIGN_FPSTATE);

	preempt_enable();

}



/*