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

Commit b2aa44c5 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.171 (b355d4f7) into msm-4.4"

parents 1bc2a5fa cf61d4f2

Documentation/ABI/testing/sysfs-fs-f2fs

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

		 Controls the number of trials to find a victim segment.



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

Date:		October 2018

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

Description:

		 Controls migration granularity of garbage collection on large

		 section, it can let GC move partial segment{s} of one section

		 in one GC cycle, so that dispersing heavy overhead GC to

		 multiple lightweight one.



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

Date:		March 2014

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

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -11469,6 +11469,19 @@ S: Maintained 
F:	drivers/media/v4l2-core/videobuf2-*

F:	include/media/videobuf2-*



VIRTIO AND VHOST VSOCK DRIVER

M:	Stefan Hajnoczi <stefanha@redhat.com>

L:	kvm@vger.kernel.org

L:	virtualization@lists.linux-foundation.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	include/linux/virtio_vsock.h

F:	include/uapi/linux/virtio_vsock.h

F:	net/vmw_vsock/virtio_transport_common.c

F:	net/vmw_vsock/virtio_transport.c

F:	drivers/vhost/vsock.c

F:	drivers/vhost/vsock.h



VIRTUAL SERIO DEVICE DRIVER

M:	Stephen Chandler Paul <thatslyude@gmail.com>

S:	Maintained

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 169

SUBLEVEL = 171

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mach-imx/cpuidle-imx6sx.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int __init imx6sx_cpuidle_init(void) 
	 * except for power up sw2iso which need to be

	 * larger than LDO ramp up time.

	 */

	imx_gpc_set_arm_power_up_timing(2, 1);

	imx_gpc_set_arm_power_up_timing(0xf, 1);

	imx_gpc_set_arm_power_down_timing(1, 1);



	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

arch/arm64/configs/cuttlefish_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ CONFIG_NET_CLS_U32=y 
CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y

CONFIG_NET_CLS_ACT=y

CONFIG_VSOCKETS=y

CONFIG_VIRTIO_VSOCKETS=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_DEFAULT_PS is not set

CONFIG_MAC80211=y
@@ -353,6 +355,7 @@ CONFIG_RTC_DRV_PL031=y 
CONFIG_VIRTIO_PCI=y

# CONFIG_VIRTIO_PCI_LEGACY is not set

CONFIG_VIRTIO_BALLOON=y

CONFIG_VIRTIO_INPUT=y

CONFIG_VIRTIO_MMIO=y

CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y

CONFIG_STAGING=y
@@ -384,6 +387,8 @@ CONFIG_SDCARD_FS=y 
CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_VIRTUALIZATION=y

CONFIG_VHOST_VSOCK=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_MUST_CHECK is not set