Merge android-4.4.137 (a2e2217b) into msm-4.4

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

Description:

		 Controls the trimming rate in batch mode.

		 <deprecated>

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

Date:		October 2015

                       passes down hints with its policy.

alloc_mode=%s          Adjust block allocation policy, which supports "reuse"

                       and "default".

fsync_mode=%s          Control the policy of fsync. Currently supports "posix"

                       and "strict". In "posix" mode, which is default, fsync

                       will follow POSIX semantics and does a light operation

                       to improve the filesystem performance. In "strict" mode,

                       fsync will be heavy and behaves in line with xfs, ext4

                       and btrfs, where xfstest generic/342 will pass, but the

                       performance will regress.

fsync_mode=%s          Control the policy of fsync. Currently supports "posix",

                       "strict", and "nobarrier". In "posix" mode, which is

                       default, fsync will follow POSIX semantics and does a

                       light operation to improve the filesystem performance.

                       In "strict" mode, fsync will be heavy and behaves in line

                       with xfs, ext4 and btrfs, where xfstest generic/342 will

                       pass, but the performance will regress. "nobarrier" is

                       based on "posix", but doesn't issue flush command for

                       non-atomic files likewise "nobarrier" mount option.

test_dummy_encryption  Enable dummy encryption, which provides a fake fscrypt

                       context. The fake fscrypt context is used by xfstests.

   dash marker line as described in Documentation/SubmittingPatches to

   temporarily embed that information into the patch that you send.

Q: Are all networking bug fixes backported to all stable releases?

A: Due to capacity, Dave could only take care of the backports for the last

   2 stable releases. For earlier stable releases, each stable branch maintainer

   is supposed to take care of them. If you find any patch is missing from an

   earlier stable branch, please notify stable@vger.kernel.org with either a

   commit ID or a formal patch backported, and CC Dave and other relevant

   networking developers.

Q: Someone said that the comment style and coding convention is different

   for the networking content.  Is this true?

VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 135

SUBLEVEL = 137

EXTRAVERSION =

NAME = Blurry Fish Butt

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_POSIX_MQUEUE=y

# CONFIG_USELIB is not set

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_ARCH_MMAP_RND_BITS=24

CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_VEXPRESS=y

CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_CMDLINE="console=ttyAMA0"

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_COMPAT=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_ESP=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_TARGET_ECN=y

CONFIG_IP_NF_TARGET_TTL=y

CONFIG_IP6_NF_MATCH_HL=y

CONFIG_IP6_NF_MATCH_IPV6HEADER=y

CONFIG_IP6_NF_MATCH_MH=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_MATCH_RT=y

CONFIG_IP6_NF_TARGET_HL=y

CONFIG_IP6_NF_FILTER=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y

CONFIG_NET_CLS_ACT=y

# CONFIG_WIRELESS is not set

CONFIG_MAC80211=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_VIRTIO_BLK=y

CONFIG_UID_SYS_STATS=y

CONFIG_MEMORY_STATE_TIME=y

CONFIG_SCSI=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_PPP_MPPE=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

# CONFIG_WLAN is not set

CONFIG_USB_USBNET=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_KEYRESET=y

CONFIG_KEYBOARD_GOLDFISH_EVENTS=y

CONFIG_KEYBOARD_GOLDFISH_ROTARY=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD_FF=y

CONFIG_JOYSTICK_XPAD_LEDS=y

CONFIG_INPUT_TABLET=y

CONFIG_TABLET_USB_ACECAD=y

CONFIG_TABLET_USB_AIPTEK=y

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_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_VIRTIO_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_BATTERY_GOLDFISH=y

# CONFIG_HWMON is not set

CONFIG_MEDIA_SUPPORT=y

CONFIG_HID_EMS_FF=y

CONFIG_HID_ELECOM=y

CONFIG_HID_EZKEY=y

CONFIG_HID_HOLTEK=y

CONFIG_HID_KEYTOUCH=y

CONFIG_HID_KYE=y

CONFIG_HID_UCLOGIC=y

CONFIG_HID_WALTOP=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MONTEREY=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NTRIG=y

CONFIG_HID_ORTEK=y

CONFIG_HID_PANTHERLORD=y

CONFIG_PANTHERLORD_FF=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_PICOLCD=y

CONFIG_HID_PRIMAX=y

CONFIG_HID_ROCCAT=y

CONFIG_HID_SAITEK=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SPEEDLINK=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

CONFIG_HID_WIIMOTE=y

CONFIG_HID_ZEROPLUS=y

CONFIG_HID_ZYDACRON=y

# CONFIG_USB_SUPPORT is not set

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_GADGET=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_RTC_CLASS=y

CONFIG_VIRTIO_MMIO=y

CONFIG_STAGING=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_FUSE_FS=y

CONFIG_CUSE=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_PANIC_TIMEOUT=5

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

# CONFIG_FTRACE is not set

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_DEBUG_RODATA=y

CONFIG_KEYS=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_SHA512=y