Merge android-4.4.186 (aeb051d) into msm-4.4

* refs/heads/tmp-aeb051d
  Linux 4.4.186
  KVM: x86: protect KVM_CREATE_PIT/KVM_CREATE_PIT2 with kvm->lock
  s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
  s390/qdio: (re-)initialize tiqdio list entries
  s390: fix stfle zero padding
  ARC: hide unused function unw_hdr_alloc
  kvm: x86: avoid warning on repeated KVM_SET_TSS_ADDR
  dm verity: use message limit for data block corruption message
  sis900: fix TX completion
  ppp: mppe: Add softdep to arc4
  be2net: fix link failure after ethtool offline test
  ARM: omap2: remove incorrect __init annotation
  perf/core: Fix perf_sample_regs_user() mm check
  e1000e: start network tx queue only when link is up
  MIPS: Remove superfluous check for __linux__
  VMCI: Fix integer overflow in VMCI handle arrays
  carl9170: fix misuse of device driver API
  staging: comedi: amplc_pci230: fix null pointer deref on interrupt
  staging: comedi: dt282x: fix a null pointer deref on interrupt
  usb: renesas_usbhs: add a workaround for a race condition of workqueue
  usb: gadget: ether: Fix race between gether_disconnect and rx_submit
  USB: serial: option: add support for GosunCn ME3630 RNDIS mode
  USB: serial: ftdi_sio: add ID for isodebug v1
  mwifiex: Don't abort on small, spec-compliant vendor IEs
  fscrypt: don't set policy for a dead directory
  mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
  mwifiex: Abort at too short BSS descriptor element
  x86/tls: Fix possible spectre-v1 in do_get_thread_area()
  x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
  udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
  bnx2x: Check if transceiver implements DDM before access
  md: fix for divide error in status_resync
  ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
  ARM: davinci: da850-evm: call regulator_has_full_constraints()
  Input: imx_keypad - make sure keyboard can always wake up system
  can: mcp251x: add support for mcp25625
  dt-bindings: can: mcp251x: add mcp25625 support
  mwifiex: Fix possible buffer overflows at parsing bss descriptor
  mac80211: mesh: fix RCU warning
  samples, bpf: fix to change the buffer size for read()
  Input: elantech - enable middle button support on 2 ThinkPads
  ANDROID: overlayfs ovl_create_of_link regression

Change-Id: I42190d7fc7de3f2287199a9f69bc42bcf3596ec7
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

diff --cc Makefile
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/net/can/spi/Kconfig
index e6b3862,249d2db..618ec96
--- 1/drivers/net/can/spi/Kconfig
--- 2/drivers/net/can/spi/Kconfig
+++ b/drivers/net/can/spi/Kconfig
@@@ -2,26 -2,10 +2,27 @@@ menu "CAN SPI interfaces
        depends on SPI
  
  config CAN_MCP251X
-       tristate "Microchip MCP251x SPI CAN controllers"
+       tristate "Microchip MCP251x and MCP25625 SPI CAN controllers"
        depends on HAS_DMA
        ---help---
-         Driver for the Microchip MCP251x SPI CAN controllers.
+         Driver for the Microchip MCP251x and MCP25625 SPI CAN
+         controllers.
  
 +config CAN_RH850
 +      tristate "Renesas RH850 SPI CAN controller"
 +      depends on HAS_DMA
 +      ---help---
 +        Driver for the Renesas RH850 SPI CAN controller.
 +
 +config CAN_K61
 +      tristate "Freescale K61 SPI CAN controllers"
 +      depends on SPI
 +      ---help---
 +        Driver for the Freescale K61 SPI CAN controllers.
 +
 +config QTI_CAN
 +      tristate "Unified driver for QTI CAN controllers"
 +      depends on SPI
 +      ---help---
 +        Unified driver for QTI CAN controllers.
  endmenu

diff --cc drivers/usb/gadget/function/u_ether.c
Simple merge

diff --cc kernel/events/core.c
Simple merge