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

Commit 55b4dd97 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.178 (7af10f29) into msm-4.4"

parents 6a75b0f7 43751312

Documentation/ABI/testing/sysfs-fs-f2fs

+7 −0
Original line number Diff line number Diff line
@@ -86,6 +86,13 @@ Description: 
		The unit size is one block, now only support configuring in range

		of [1, 512].



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

Date:          January 2019

Contact:       "Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		Set timeout to issue discard commands during umount.

		Default: 5 secs



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

Date:		January 2014

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

Documentation/filesystems/f2fs.txt

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ 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_xattr_size=%u   Support configuring inline xattr size, it depends on

		       flexible inline xattr 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

Documentation/virtual/kvm/api.txt

+11 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ of a virtual machine. The ioctls belong to three classes 


 - VM ioctls: These query and set attributes that affect an entire virtual

   machine, for example memory layout.  In addition a VM ioctl is used to

   create virtual cpus (vcpus).

   create virtual cpus (vcpus) and devices.



   Only run VM ioctls from the same process (address space) that was used

   to create the VM.
@@ -24,6 +24,11 @@ of a virtual machine. The ioctls belong to three classes 
   Only run vcpu ioctls from the same thread that was used to create the

   vcpu.



 - device ioctls: These query and set attributes that control the operation

   of a single device.



   device ioctls must be issued from the same process (address space) that

   was used to create the VM.



2. File descriptors

-------------------
@@ -32,10 +37,11 @@ The kvm API is centered around file descriptors. An initial 
open("/dev/kvm") obtains a handle to the kvm subsystem; this handle

can be used to issue system ioctls.  A KVM_CREATE_VM ioctl on this

handle will create a VM file descriptor which can be used to issue VM

ioctls.  A KVM_CREATE_VCPU ioctl on a VM fd will create a virtual cpu

and return a file descriptor pointing to it.  Finally, ioctls on a vcpu

fd can be used to control the vcpu, including the important task of

actually running guest code.

ioctls.  A KVM_CREATE_VCPU or KVM_CREATE_DEVICE ioctl on a VM fd will

create a virtual cpu or device and return a file descriptor pointing to

the new resource.  Finally, ioctls on a vcpu or device fd can be used

to control the vcpu or device.  For vcpus, this includes the important

task of actually running guest code.



In general file descriptors can be migrated among processes by means

of fork() and the SCM_RIGHTS facility of unix domain socket.  These

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 177

SUBLEVEL = 178

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/configs/ranchu_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ CONFIG_TABLET_USB_GTCO=y 
CONFIG_TABLET_USB_HANWANG=y

CONFIG_TABLET_USB_KBTAB=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_KEYCHORD=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=y

# CONFIG_SERIO_SERPORT is not set