Merge tag 'lsk-v3.18-17.05-android' into 'msm-3.18'

LSK Android 17.05 v3.18

* origin/tmp-61c92ff9:
  UPSTREAM: arm: perf: Fix callchain parse error with kernel tracepoint events
  UPSTREAM: ARM: 8170/1: Add global named register current_stack_pointer for ARM
  UPSTREAM: arm64: perf: Fix callchain parse error with kernel tracepoint events
  uid_sys_stats: defer io stats calulation for dead tasks
  ANDROID: sdcardfs: Check for NULL in revalidate
  ANDROID: sdcardfs: Add linux/kref.h include
  ANDROID: sdcardfs: Move top to its own struct
  lowmemorykiller: account for unevictable pages
  BACKPORT: ARM: dts: add wl12xx/wl18xx bindings
  ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line
  ARM: 8285/1: remove ARMv3 user access code again
  Revert "cpu: add generic support for CPU feature based module autoloading"
  PM / Suspend: use time_to_tm for printing timestamps
  trace: fix trace_graph_ret_raw return type
  ANDROID: rfkill: fix unused function warning
  ANDROID: power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled
  ANDROID: dm: android-verity: hide __setup functions in loadable module
  ANDROID: memory_state_time: fix undefined behavior with missing DT properties
  UPSTREAM: wlcore: add p2p device support
  BACKPORT: wl18xx: add radar detection implementation
  UPSTREAM: wl18xx: fallback to default conf in case of invalid conf file
  UPSTREAM: wlcore: sdio: return correct error code
  UPSTREAM: wlcore: remove wl12xx_platform_data
  BACKPORT: wl12xx: use frequency instead of enumerations for pdata clocks
  UPSTREAM: wlcore: add device-tree support
  UPSTREAM: wlcore: set irq_trigger in board files instead of hiding behind a quirk
  UPSTREAM: mmc: Add SDIO function devicetree subnode parsing
  ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.
  ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
  Revert "BACKPORT: [UPSTREAM] ext2: convert to mbcache2"
  Revert "BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache"
  Revert "BACKPORT: [UPSTREAM] ext4: convert to mbcache2"
  ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG
  ANDROID: sdcardfs: Don't iput if we didn't igrab
  ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK
  ANDROID: android-base.cfg: remove defunct options
  ANDROID: Add untag hacks to inet_release function
  ANDROID: uid_sys_stats: fix access of task_uid(task)
  UPSTREAM: ext4: fix fencepost in s_first_meta_bg validation
  BACKPORT: ext4: validate s_first_meta_bg at mount time
  BACKPORT: f2fs: sanity check log_blocks_per_seg
  ANDROID: sdcardfs: Call lower fs's revalidate
  ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges
  ANDROID: sdcardfs: Copy meta-data from lower inode
  Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs""
  ANDROID: sdcardfs: Use filesystem specific hash
  Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"
  ANDROID: uid_sys_stats: reduce update_io_stats overhead
  UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on
  UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K
  Revert "Android: sdcardfs: Don't do d_add for lower fs"
  Android: sdcardfs: Don't complain in fixup_lower_ownership
  Android: sdcardfs: Don't do d_add for lower fs
  ANDROID: sdcardfs: ->iget fixes
  Android: sdcardfs: Change cache GID value
  BACKPORT: [UPSTREAM] ext2: convert to mbcache2
  BACKPORT: [UPSTREAM] ext4: convert to mbcache2
  BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache
  UPSTREAM: ARM: keystone2: move update of the phys-to-virt constants into generic code
  UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static
  UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect.
  UPSTREAM: net/packet: fix overflow in check for priv area size
  ANDROID: dm verity: Export dm_disk
  BACKPORT: UPSTREAM: selinux: fix off-by-one in setprocattr
  ANDROID: Skip building uid_sys_stats and keyreset drivers as modules
  UPSTREAM: init: export name_to_dev_t and mark name argument as const
  BACKPORT: UPSTREAM: sysctl: Drop reference added by grab_header in proc_sys_readdir
  Revert "BACKPORT [UPSTREAM] net: add real socket cookies"
  BACKPORT: UPSTREAM: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
  UPSTREAM: ipv4: keep skb->dst around in presence of IP options
  BACKPORT [UPSTREAM] net: add real socket cookies
  BACKPORT: checkpatch: special audit for revert commit line
  ANDROID: sdcardfs: Directly pass lower file for mmap
  UPSTREAM: PM / sleep: make PM notifiers called symmetrically
  Revert "ARM: 8457/1: psci-smp is built only for SMP"
  staging: android: ashmem: lseek failed due to no FMODE_LSEEK.
  ANDROID: sdcardfs: update module info
  UPSTREAM: ARM: 8408/1: Fix the secondary_startup function in Big Endian case
  arm: vdso: Rename timekeeper::tkr to timekeeper::tkr_mono
  ANDROID: sdcardfs: use d_splice_alias
  ANDROID: sdcardfs: add read_iter/write_iter opeations
  ANDROID: sdcardfs: fix ->llseek to update upper and lower offset
  ANDROID: sdcardfs: copy lower inode attributes in ->ioctl
  ANDROID: sdcardfs: remove unnecessary call to do_munmap
  UPSTREAM: ipv6 addrconf: implement RFC7559 router solicitation backoff
  Revert "[ARM] armv6 dcc tty driver"
  Revert "arm: dcc_tty: fix armv6 dcc tty build failure"
  Revert "panic: Add board ID to panic output"
  Revert "net: socket ioctl to reset connections matching local address"
  Revert "tcp: Silence warning: ‘in’ may be used uninitialized"
  Revert "export tcp_nuke_addr to build ipv6 as module"
  Revert "net: tcp: fix rtable leak in tcp_is_local[6]"
  Revert "tcp: Fix build error if IPV6 is not selected"
  Revert "net: fix iterating over hashtable in tcp_nuke_addr()"
  Revert "net: fix crash in tcp_nuke_addr()"
  Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."
  ANDROID: base-cfg: enable CONFIG_IP_NF_NAT
  ANDROID: android-base.cfg: enable UID_SYS_STATS
  android: base-cfg: Add CONFIG_INET_DIAG_DESTROY
  config: android: set SELinux as default security mode
  config: android: move device mapper options to recommended
  ANDROID: android-base.cfg: add CONFIG_MODULES option
  ANDROID: android-base.cfg: add CONFIG_IKCONFIG option
  ANDROID: android-base.cfg: properly sort the file
  ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
  config/android: Remove CONFIG_IPV6_PRIVACY
  net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs.
  config: disable CONFIG_USELIB and CONFIG_FHANDLE
  UPSTREAM: arm64: vdso: constify vm_special_mapping used for aarch32 vectors page
  UPSTREAM: arm64: vdso: add __init section marker to alloc_vectors_page
  UPSTREAM: ARM: 8597/1: VDSO: put RO and RO after init objects into proper sections
  UPSTREAM: arm64: Add support for CLOCK_MONOTONIC_RAW in clock_gettime() vDSO
  UPSTREAM: arm64: Refactor vDSO time functions
  BACKPORT: arm64: fix vdso-offsets.h dependency
  UPSTREAM: kbuild: drop FORCE from PHONY targets
  UPSTREAM: mm: add PHYS_PFN, use it in __phys_to_pfn()
  UPSTREAM: ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check
  UPSTREAM: arm64: build vdso without libgcov
  UPSTREAM: mm: fix type cast in __pfn_to_phys()
  UPSTREAM: mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h
  UPSTREAM: ARM: 8410/1: VDSO: fix coarse clock monotonicity regression
  UPSTREAM: ARM: 8405/1: VDSO: fix regression with toolchains lacking ld.bfd executable
  UPSTREAM: ARM: 8384/1: VDSO: force use of BFD linker
  UPSTREAM: ARM: 8385/1: VDSO: group link options
  UPSTREAM: ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
  UPSTREAM: ARM: 8343/1: VDSO: add build artifacts to .gitignore
  UPSTREAM: ARM: 8342/1: VDSO: depend on CPU_V7
  UPSTREAM: ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits
  BACKPORT: ARM: 8331/1: VDSO initialization, mapping, and synchronization
  UPSTREAM: ARM: 8330/1: add VDSO user-space code
  UPSTREAM: ARM: 8329/1: miscellaneous vdso infrastructure, preparation
  BACKPORT: time: Add timerkeeper::tkr_raw
  BACKPORT: time: Rename timekeeper::tkr to timekeeper::tkr_mono
  Revert "net: sysctl_net_core: Fix warning: 'one' defined but not used"
  ANDROID: sdcardfs: Fix style issues in macros
  ANDROID: sdcardfs: Use seq_puts over seq_printf
  ANDROID: sdcardfs: Use to kstrout
  ANDROID: sdcardfs: Use pr_[...] instead of printk
  ANDROID: sdcardfs: remove unneeded null check
  ANDROID: sdcardfs: Fix style issues with comments
  ANDROID: sdcardfs: Fix formatting
  ANDROID: sdcardfs: correct order of descriptors
  ANDROID: fix the deadlock in xt_qtaguid when enable DDEBUG
  ANDROID: mmc: core: export emmc revision
  BACKPORT: mmc: core: Export device lifetime information through sysfs
  net: ping: check minimum size on ICMP header length
  netfilter: Change %p to %pK in debug messages
  UPSTREAM: drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE
  BACKPORT: perf: Fix event->ctx locking
  misc: uidstat: change release handler for stat read operation
  power: align wakeup_sources format
  ANDROID: dm: android-verity: allow disable dm-verity for Treble VTS
  uid_sys_stats: fix typo in init
  uid_sys_stats: change to use rt_mutex
  ANDROID: sdcardfs: Fix gid issue
  ANDROID: sdcardfs: Use tabs instead of spaces in multiuser.h
  ANDROID: sdcardfs: Remove uninformative prints
  ANDROID: sdcardfs: move path_put outside of spinlock
  ANDROID: sdcardfs: Use case insensitive hash function
  ANDROID: sdcardfs: declare MODULE_ALIAS_FS
  ANDROID: sdcardfs: Get the blocksize from the lower fs
  ANDROID: sdcardfs: Use d_invalidate instead of drop_recurisve
  ANDROID: sdcardfs: Switch to internal case insensitive compare
  ANDROID: sdcardfs: Use spin_lock_nested
  ANDROID: sdcardfs: Replace get/put with d_lock
  ANDROID: sdcardfs: rate limit warning print
  ANDROID: sdcardfs: Fix case insensitive lookup
  ANDROID: Replace spaces by '_' for some android filesystem tracepoints.
  android: binder: move global binder state into context struct.
  android: binder: add padding to binder_fd_array_object.
  binder: use group leader instead of open thread
  input: evdev: Move wake_lock_destroy call
  UPSTREAM staging: ion: Fix error handling in ion_buffer_create
  UPSTREAM: regulator: core: Fix regualtor_ena_gpio_free not to access pin after freeing
  crypto: arm - ignore generated SHA2 assembly files
  ANDROID: uid_sys_stats: account for fsync syscalls
  ANDROID: sched: add a counter to track fsync
  ANDROID: uid_sys_stats: fix negative write bytes.
  ANDROID: uid_sys_stats: remove unnecessary code in procstat switch
  ANDROID: uid_sys_stats: return full size when state is not changed.
  ANDROID: uid_sys_stats: allow writing same state
  ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c
  ANDROID: uid_cputime: add per-uid IO usage accounting
  Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend."
  cpufreq: interactive governor drops bits in time calculation
  BACKPORT: n_tty: Fix unordered accesses to lockless read buffer
  perf: Tighten (and fix) the grouping condition
  ALSA: pcm : Call kill_fasync() in stream lock
  ANDROID: sdcardfs: support direct-IO (DIO) operations
  ANDROID: sdcardfs: implement vm_ops->page_mkwrite
  ANDROID: sdcardfs: Don't bother deleting freelist
  BACKPORT: ARM: re-implement physical address space switching
  ANDROID: sdcardfs: Add missing path_put
  ANDROID: sdcardfs: Fix incorrect hash
  ANDROID: Refactor fs readpage/write tracepoints.
  ANDROID: ext4 crypto: Disables zeroing on truncation when there's no key
  ANDROID: binder: fix format specifier for type binder_size_t
  Squashfs: optimize reading uncompressed data
  Squashfs: implement .readpages()
  Squashfs: replace buffer_head with BIO
  Squashfs: refactor page_actor
  Squashfs: remove the FILE_CACHE option
  ANDROID: android-recommended.cfg: CONFIG_CPU_SW_DOMAIN_PAN=y
  UPSTREAM: arm64: Allow hw watchpoint of length 3,5,6 and 7
  BACKPORT: arm64: hw_breakpoint: Handle inexact watchpoint addresses
  UPSTREAM: arm64: Allow hw watchpoint at varied offset from base address
  BACKPORT: hw_breakpoint: Allow watchpoint of length 3,5,6 and 7

Conflicts:
	android/configs/android-recommended.cfg
	drivers/misc/Makefile
	drivers/misc/uid_stat.c
	drivers/mmc/core/bus.c
	drivers/mmc/core/mmc.c
	drivers/staging/android/binder.c
	drivers/tty/n_tty.c
	drivers/usb/gadget/function/f_accessory.c
	drivers/usb/gadget/function/f_mtp.c
	drivers/usb/gadget/function/u_ether.c
	fs/ext4/inline.c
	fs/ext4/inode.c
	fs/ext4/readpage.c
	fs/f2fs/data.c
	fs/f2fs/inline.c
	fs/mpage.c
	include/linux/mmc/card.h
	include/linux/mmc/mmc.h
	include/linux/wakeup_reason.h
	include/trace/events/android_fs.h
	include/trace/events/android_fs_template.h
	include/uapi/linux/ipv6.h
	kernel/events/core.c
	kernel/sched/core.c
	kernel/sched/fair.c
	kernel/sched/sched.h
	net/ipv4/tcp.c

USB and scheduler changes were ignored completely as per feedback
from resepective teams.
Also since UID_CPUTIME has been incorporated under UID_SYS_STATS,
all msm defconfigs were modified to use UID_SYS_STATS in place
of UID_CPUTIME.

drivers/misc/uid_sys_stats.c was modified to access configuration
dependent taskstats fields only if corresponding flags(TASK_XACCT
and/or TASK_IO_ACCOUNTING) are enabled. This change is needed to make
access of relevant taskstats fields compatible with definition
given in task_io_accounting.h.

CONFIG_ANDROID_BINDER_DEVICES was removed from msm defconfig files, since		
the needed value now comes as default

Change-Id: Icdb529a7804d55f9b8637bf795bcf33b031d2309
Signed-off-by: Imran Khan <kimran@codeaurora.org>