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

Merge with google common 'android-3.18' at
18c43e67 into 'msm-3.18'

* quic/tmp-18c43e67:
  UPSTREAM: fscrypt: fix dereference of NULL user_key_payload
  Linux 3.18.79
  ecryptfs: fix dereference of NULL user_key_payload
  can: kvaser_usb: Correct return value in printout
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  assoc_array: Fix a buggy node-splitting case
  Input: gtco - fix potential out-of-bound access
  fuse: fix READDIRPLUS skipping an entry
  spi: uapi: spidev: add missing ioctl header
  ceph: unlock dangling spinlock in try_flush_caps()
  ANDROID: binder: show high watermark of alloc->pages.
  ANDROID: binder: Add thread->process_todo flag.
  Linux 3.18.78
  FS-Cache: fix dereference of NULL user_key_payload
  af_packet: don't pass empty blocks for PACKET_V3
  parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
  parisc: Avoid trashing sr2 and sr3 in LWS code
  cls_api.c: Fix dumping of non-existing actions' stats.
  KEYS: don't let add_key() update an uninstantiated key
  lib/digsig: fix dereference of NULL user_key_payload
  KEYS: encrypted: fix dereference of NULL user_key_payload
  bus: mbus: fix window size calculation for 4GB windows
  brcmsmac: make some local variables 'static const' to reduce stack size
  i2c: ismt: Separate I2C block read from SMBus block read
  ALSA: hda: Remove superfluous '-' added by printk conversion
  ALSA: seq: Enable 'use' locking in all configurations
  can: esd_usb2: Fix can_dlc value for received RTR, frames
  can: gs_usb: fix busy loop if no more TX context is available
  FROMLIST: android: binder: Fix null ptr dereference in debug msg
  FROMLIST: android: binder: Change binder_shrinker to static
  Linux 3.18.77
  Revert "tty: goldfish: Fix a parameter of a call to free_irq"
  target/iscsi: Fix unsolicited data seq_end_offset calculation
  uapi: fix linux/mroute6.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation errors
  scsi: scsi_dh_emc: return success in clariion_std_inquiry()
  ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
  crypto: xts - Add ECB dependency
  net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
  Btrfs: send, fix failure to rename top level inode due to name collision
  iio: adc: xilinx: Fix error handling
  netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
  irqchip/crossbar: Fix incorrect type of local variables
  watchdog: kempld: fix gcc-4.3 build
  locking/lockdep: Add nest_lock integrity test
  Revert "bsg-lib: don't free job in bsg_prepare_job"
  net: Set sk_prot_creator when cloning sockets to the right proto
  packet: in packet_do_bind, test fanout with bind_lock held
  l2tp: fix race condition in l2tp_tunnel_delete
  l2tp: Avoid schedule while atomic in exit_net
  vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit
  isdn/i4l: fetch the ppp_write buffer in one shot
  packet: hold bind lock when rebinding to fanout hook
  bpf/verifier: reject BPF_ALU64|BPF_END
  sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
  ext4: avoid deadlock when expanding inode size
  drm/dp/mst: save vcpi with payloads
  x86/mm: Disable preemption during CR3 read+write
  ANDROID: net: xfrm: fix long lines.
  Linux 3.18.76
  ALSA: seq: Fix missing NULL check at remove_events ioctl
  USB: serial: console: fix use-after-free after failed setup
  USB: serial: qcserial: add Dell DW5818, DW5819
  USB: serial: option: add support for TP-Link LTE module
  USB: serial: cp210x: add support for ELV TFD500
  fix unbalanced page refcounting in bio_map_user_iov
  direct-io: Prevent NULL pointer access in submit_page_section
  ALSA: caiaq: Fix stray URB at probe error path
  ALSA: seq: Fix copy_from_user() call inside lock
  ALSA: seq: Fix use-after-free at creating a port
  ALSA: usb-audio: Kill stray URB at exiting
  iommu/amd: Finish TLB flush in amd_iommu_unmap()
  KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
  crypto: shash - Fix zero-length shash ahash digest crash
  HID: usbhid: fix out-of-bounds bug
  CIFS: Reconnect expired SMB sessions
  ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
  UPSTREAM: arm64: compat: Remove leftover variable declaration
  FROMLIST: f2fs: expose some sectors to user in inline data or dentry case
  UPSTREAM: f2fs: fix potential panic during fstrim
  ANDROID: binder: fix node sched policy calculation
  ANDROID: binder: init desired_prio.sched_policy before use it
  Linux 3.18.75
  ext4: fix fencepost in s_first_meta_bg validation
  ext4: validate s_first_meta_bg at mount time
  ext4: Don't clear SGID when inheriting ACLs
  ext4: fix data corruption for mmap writes
  fs/super.c: fix race between freeze_super() and thaw_super()
  ext4: only call ext4_truncate when size <= isize
  drm/i915/bios: ignore HDMI on port A
  HID: i2c-hid: allocate hid buffers for real worst case
  driver core: platform: Don't read past the end of "driver_override" buffer
  ALSA: usx2y: Suppress kernel warning at page allocation failures
  lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
  uwb: ensure that endpoint is interrupt
  uwb: properly check kthread_run return value
  iio: adc: mcp320x: Fix oops on module unload
  iio: ad7793: Fix the serial interface reset
  iio: core: Return error for failed read_reg
  staging: iio: ad7192: Fix - use the dedicated reset function avoiding dma from stack.
  iio: ad_sigma_delta: Implement a dedicated reset function
  xhci: fix finding correct bus_state structure for USB 3.1 hosts
  ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
  BACKPORT: net: xfrm: support setting an output mark.
  Linux 3.18.74
  mpi: Fix NULL ptr dereference in mpi_powm() [ver #3]
  crypto: algif_skcipher - Load TX SG list after waiting
  staging: nvec: remove duplicated const
  ttpci: address stringop overflow warning
  ALSA: au88x0: avoid theoretical uninitialized access
  IB/qib: fix false-postive maybe-uninitialized warning
  libata: transport: Remove circular dependency at free time
  xfs: remove kmem_zalloc_greedy
  md/raid10: submit bio directly to replacement disk
  rds: ib: add error handle
  parisc: perf: Fix potential NULL pointer dereference
  netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max
  exynos-gsc: Do not swap cb/cr for semi planar formats
  netfilter: invoke synchronize_rcu after set the _hook_ to NULL
  mmc: sdio: fix alignment issue in struct sdio_func
  usb: plusb: Add support for PL-27A1
  team: fix memory leaks
  net/packet: check length in getsockopt() called with PACKET_HDRLEN
  net: core: Prevent from dereferencing null pointer when releasing SKB
  audit: log 32-bit socketcalls
  partitions/efi: Fix integer overflow in GPT size calculation
  USB: serial: mos7840: fix control-message error handling
  USB: serial: mos7720: fix control-message error handling
  IB/ipoib: Replace list_del of the neigh->list with list_del_init
  IB/ipoib: rtnl_unlock can not come after free_netdev
  IB/ipoib: Fix deadlock over vlan_mutex
  tty: goldfish: Fix a parameter of a call to free_irq
  ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM
  hwmon: (gl520sm) Fix overflows and crash seen when writing into limit attributes
  sh_eth: use correct name for ECMR_MPDE bit
  MIPS: Ensure bss section ends on a long-aligned address
  RDS: RDMA: Fix the composite message user notification
  drm: bridge: add DT bindings for TI ths8135
  UPSTREAM: x86/mm/32: Enable full randomization on i386 and X86_32
  UPSTREAM: mpi: Fix NULL ptr dereference in mpi_powm() [ver #3]
  ANDROID: binder: fix transaction leak.
  ANDROID: binder: Add tracing for binder priority inheritance.
  Linux 3.18.73
  fix xen_swiotlb_dma_mmap prototype
  swiotlb-xen: implement xen_swiotlb_dma_mmap callback
  video: fbdev: aty: do not leak uninitialized padding in clk to userspace
  x86/fpu: Don't let userspace set bogus xcomp_bv
  btrfs: prevent to set invalid default subvolid
  PCI: Fix race condition with driver_override
  kvm: nVMX: Don't allow L2 to access the hardware CR8
  arm64: Make sure SPsel is always set
  bsg-lib: don't free job in bsg_prepare_job
  nl80211: check for the required netlink attributes presence
  vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets
  SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
  SMB: Validate negotiate (to protect against downgrade) even if signing off
  powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
  KEYS: prevent KEYCTL_READ on negative key
  KEYS: prevent creating a different user's keyrings
  KEYS: fix writing past end of user-supplied buffer in keyring_read()
  crypto: talitos - fix sha224
  scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
  tracing: Erase irqsoff trace with empty write
  tracing: Fix trace_pipe behavior for instance traces
  KVM: PPC: Book3S: Fix race and leak in kvm_vm_ioctl_create_spapr_tce()
  mac80211: flush hw_roc_start work before cancelling the ROC
  cifs: release auth_key.response for reconnect.
  cifs: release cifs root_cred after exit_cifs
  ANDROID: add script to fetch android kernel config fragments
  FROMLIST: binder: fix use-after-free in binder_transaction()
  Linux 3.18.72
  bcache: fix bch_hprint crash and improve output
  bcache: fix for gc and write-back race
  bcache: Correct return value for sysfs attach errors
  bcache: correct cache_dirty_target in __update_writeback_rate()
  bcache: Fix leak of bdev reference
  bcache: initialize dirty stripes in flash_dev_run()
  media: uvcvideo: Prevent heap overflow when accessing mapped controls
  media: v4l2-compat-ioctl32: Fix timespec conversion
  PCI: shpchp: Enable bridge bus mastering if MSI is enabled
  ARC: Re-enable MMU upon Machine Check exception
  tracing: Apply trace_clock changes to instance max buffer
  ftrace: Fix selftest goto location on error
  scsi: qla2xxx: Fix an integer overflow in sysfs code
  scsi: sg: fixup infoleak when using SG_GET_REQUEST_TABLE
  scsi: sg: factor out sg_fill_request_table()
  scsi: sg: off by one in sg_ioctl()
  scsi: sg: use standard lists for sg_requests
  scsi: sg: remove 'save_scat_len'
  scsi: zfcp: trace high part of "new" 64 bit SCSI LUN
  scsi: zfcp: trace HBA FSF response by default on dismiss or timedout late response
  scsi: zfcp: fix payload with full FCP_RSP IU in SCSI trace records
  scsi: zfcp: fix missing trace records for early returns in TMF eh handlers
  scsi: zfcp: add handling for FCP_RESID_OVER to the fcp ingress path
  scsi: zfcp: fix queuecommand for scsi_eh commands when DIX enabled
  skd: Submit requests to firmware before triggering the doorbell
  skd: Avoid that module unloading triggers a use-after-free
  md/bitmap: disable bitmap_resize for file-backed bitmaps.
  block: Relax a check in blk_start_queue()
  powerpc: Fix DAR reporting when alignment handler faults
  ext4: fix incorrect quotaoff if the quota feature is enabled
  crypto: AF_ALG - remove SGL terminator indicator when chaining
  Input: i8042 - add Gigabyte P57 to the keyboard reset table
  ip6_gre: fix endianness errors in ip6gre_err
  f2fs: check hot_data for roll-forward recovery
  ipv6: fix typo in fib6_net_exit()
  ipv6: fix memory leak with multiple tables during netns destruction
  tcp: initialize rcv_mss to TCP_MIN_MSS instead of 0
  Revert "net: phy: Correctly process PHY_HALTED in phy_stop_machine()"
  qlge: avoid memcpy buffer overflow
  ipv6: accept 64k - 1 packet length in ip6_find_1stfragopt()
  UPSTREAM: mlx4: include clocksource.h again
  BACKPORT: e1000e: convert to CYCLECOUNTER_MASK macro.
  UPSTREAM: arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE
  BACKPORT: igb: convert to CYCLECOUNTER_MASK macro.
  UPSTREAM: ixgbe: convert to CYCLECOUNTER_MASK macro.
  UPSTREAM: arm64: fix missing asm/alternative.h include in kernel/module.c
  UPSTREAM: bnx2x: convert to CYCLECOUNTER_MASK macro.
  UPSTREAM: timecounter: provide a macro to initialize the cyclecounter mask field.
  FROMLIST: android: binder: Don't get mm from task
  FROMLIST: android: binder: Remove unused vma argument
  FROMLIST: android: binder: Drop lru lock in isolate callback
  BACKPORT: partial: mm, oom_reaper: do not mmput synchronously from the oom reaper context
  UPSTREAM: time: move the timecounter/cyclecounter code into its own file.
  UPSTREAM: arm64: fix missing linux/bug.h include in asm/arch_timer.h
  UPSTREAM: arm64: fix missing asm/io.h include in kernel/smp_spin_table.c
  UPSTREAM: arm64: fix missing asm/pgtable-hwdef.h include in asm/processor.h
  Revert "FROMLIST: android: binder: Drop lru lock in isolate callback"
  FROMLIST: android: binder: Drop lru lock in isolate callback
  ANDROID: f2fs: correct inconsistent cherry-pick
  f2fs: add lazytime mount option
  vfs: add support for a lazytime mount option
  f2fs: hurry up to issue discard after io interruption
  f2fs: fix to show correct discard_granularity in sysfs
  f2fs: detect dirty inode in evict_inode
  f2fs: clear radix tree dirty tag of pages whose dirty flag is cleared
  f2fs: speed up gc_urgent mode with SSR
  f2fs: better to wait for fstrim completion
  f2fs: avoid race in between read xattr & write xattr
  f2fs: make get_lock_data_page to handle encrypted inode
  f2fs: use generic terms used for encrypted block management
  f2fs: introduce f2fs_encrypted_file for clean-up
  Revert "f2fs: add a new function get_ssr_cost"
  f2fs: constify super_operations
  f2fs: fix to wake up all sleeping flusher
  f2fs: avoid race in between atomic_read & atomic_inc
  f2fs: remove unneeded parameter of change_curseg
  f2fs: update i_flags correctly
  f2fs: don't check inode's checksum if it was dirtied or writebacked
  f2fs: don't need to update inode checksum for recovery
  f2fs: trigger fdatasync for non-atomic_write file
  f2fs: fix to avoid race in between aio and gc
  f2fs: wake up discard_thread iff there is a candidate
  f2fs: return error when accessing insane flie offset
  f2fs: trigger normal fsync for non-atomic_write file
  f2fs: clear FI_HOT_DATA correctly
  f2fs: fix out-of-order execution in f2fs_issue_flush
  f2fs: issue discard commands if gc_urgent is set
  f2fs: remove unused function overprovision_sections
  f2fs: check hot_data for roll-forward recovery
  f2fs: add tracepoint for f2fs_gc
  f2fs: retry to revoke atomic commit in -ENOMEM case
  f2fs: let fill_super handle roll-forward errors
  f2fs: merge equivalent flags F2FS_GET_BLOCK_[READ|DIO]
  f2fs: support journalled quota
  f2fs: fix potential overflow when adjusting GC cycle
  f2fs: avoid unneeded sync on quota file
  f2fs: introduce gc_urgent mode for background GC
  f2fs: fix the size value in __check_sit_bitmap
  f2fs: add app/fs io stat
  f2fs: do not change the valid_block value if cur_valid_map was wrongly set or cleared
  f2fs: update cur_valid_map_mir together with cur_valid_map
  f2fs: use printk_ratelimited for f2fs_msg
  f2fs: expose features to sysfs entry
  f2fs: support inode checksum
  f2fs: return wrong error number on f2fs_quota_write
  f2fs: provide f2fs_balance_fs to __write_node_page
  f2fs: introduce f2fs_statfs_project
  f2fs: don't need to wait for node writes for atomic write
  f2fs: avoid naming confusion of sysfs init
  f2fs: support project quota
  f2fs: record quota during dot{,dot} recovery
  f2fs: enhance on-disk inode structure scalability
  f2fs: make max inline size changeable
  f2fs: preserve i_mode if __f2fs_set_acl() fails
  f2fs: alloc new nids for xattr block in recovery
  f2fs: spread struct f2fs_dentry_ptr for inline path
  f2fs: remove unused input parameter
  ANDROID: configs: remove config fragments
  FROMLIST: android: binder: Refactor prev and next buffer into a helper function
  FROMLIST: android: binder: Add allocator selftest
  FROMLIST: android: binder: Move buffer out of area shared with user space
  FROMLIST: android: binder: Add global lru shrinker to binder
  FROMLIST: android: binder: Add shrinker tracepoints
  FROMLIST: android: binder: Add page usage in binder stats

Conflicts:
	android/configs/android-recommended.cfg
	arch/x86/mm/mmap.c
	drivers/scsi/sg.c
	drivers/staging/android/binder_alloc.c
	drivers/usb/class/cdc-acm.c
	drivers/usb/core/quirks.c
	drivers/usb/gadget/legacy/inode.c
	drivers/usb/host/xhci-hub.c
	drivers/usb/renesas_usbhs/fifo.c
	drivers/usb/serial/cp210x.c
	drivers/usb/serial/qcserial.c
	include/linux/mm_types.h
	include/linux/sched.h
	kernel/fork.c
	kernel/sched/fair.c

One patch 925b850c: sched/fair: Select correct capacity state for energy_diff
is ignored in this merge , as with this patch lot of code conflicts seen.
USB related changes were ignored as per feedback
from respective team.

Change-Id: If05e5447ef998b439eb36a412a8e2ec066f965e0
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>