Merge android-4.9.94 (8683408f) into msm-4.9

* refs/heads/tmp-8683408f:
  ANDROID: Add build server config for cuttlefish.
  ANDROID: Add defconfig for cuttlefish.
  FROMLIST: staging: Android: Add 'vsoc' driver for cuttlefish.
  Revert "ANDROID: proc: make oom adjustment files user read-only"
  Revert "ANDROID: fixup! proc: make oom adjustment files user read-only"
  Linux 4.9.94
  Revert "xhci: plat: Register shutdown for xhci_plat"
  vrf: Fix use after free and double free in vrf_finish_output
  net sched actions: fix dumping which requires several messages to user space
  strparser: Fix sign of err codes
  net/mlx4_core: Fix memory leak while delete slave's resources
  vhost_net: add missing lock nesting notation
  team: move dev_mc_sync after master_upper_dev_link in team_port_add
  route: check sysctl_fib_multipath_use_neigh earlier than hash
  vhost: validate log when IOTLB is enabled
  net/mlx4_en: Fix mixed PFC and Global pause user control requests
  net/sched: fix NULL dereference on the error path of tcf_skbmod_init()
  net/sched: fix NULL dereference in the error path of tunnel_key_init()
  net/mlx5e: Sync netdev vxlan ports at open
  vti6: better validate user provided tunnel names
  ip6_tunnel: better validate user provided tunnel names
  ip6_gre: better validate user provided tunnel names
  ipv6: sit: better validate user provided tunnel names
  ip_tunnel: better validate user provided tunnel names
  net: fool proof dev_valid_name()
  bonding: process the err returned by dev_set_allmulti properly in bond_enslave
  bonding: move dev_mc_sync after master_upper_dev_link in bond_enslave
  bonding: fix the err path for dev hwaddr sync in bond_enslave
  vlan: also check phy_driver ts_info for vlan's real device
  vhost: correctly remove wait queue during poll failure
  sky2: Increase D3 delay to sky2 stops working after suspend
  sctp: sctp_sockaddr_af must check minimal addr length for AF_INET6
  sctp: do not leak kernel memory to user space
  r8169: fix setting driver_data after register_netdev
  pptp: remove a buggy dst release in pptp_connect()
  net/sched: fix NULL dereference in the error path of tcf_bpf_init()
  netlink: make sure nladdr has correct size in netlink_connect()
  net/ipv6: Increment OUTxxx counters after netfilter hook
  net/ipv6: Fix route leaking between VRFs
  net: fix possible out-of-bound read in skb_network_protocol()
  ipv6: the entire IPv6 header chain must fit the first fragment
  arp: fix arp_filter on l3slave devices
  clk: at91: fix clk-generated compilation
  random: use lockless method of accessing and updating f->reg_idx
  virtio_net: check return value of skb_to_sgvec in one more location
  virtio_net: check return value of skb_to_sgvec always
  rxrpc: check return value of skb_to_sgvec always
  ipsec: check return value of skb_to_sgvec always
  perf tools: Fix copyfile_offset update of output offset
  mtd: mtd_oobtest: Handle bitflips during reads
  Input: goodix - disable IRQs while suspended
  sdhci: Advertise 2.0v supply on SDIO host controller
  cxgb4vf: Fix SGE FL buffer initialization logic for 64K pages
  EDAC, mv64x60: Fix an error handling path
  tty: n_gsm: Allow ADM response in addition to UA for control dlci
  blk-mq: fix kernel oops in blk_mq_tag_idle()
  scsi: libsas: initialize sas_phy status according to response of DISCOVER
  scsi: libsas: fix error when getting phy events
  scsi: libsas: fix memory leak in sas_smp_get_phy_events()
  bcache: segregate flash only volume write streams
  bcache: stop writeback thread after detaching
  drm/vc4: Fix resource leak in 'vc4_get_hang_state_ioctl()' in error handling path
  selftests: kselftest_harness: Fix compile warning
  hsr: fix incorrect warning
  vxlan: dont migrate permanent fdb entries during learn
  s390/dasd: fix hanging safe offline
  ACPICA: Disassembler: Abort on an invalid/unknown AML opcode
  ACPICA: Events: Add runtime stub support for event APIs
  ACPICA: OSL: Add support to exclude stdarg.h
  cpuidle: dt: Add missing 'of_node_put()'
  Bluetooth: Send HCI Set Event Mask Page 2 command only when needed
  clk: meson: meson8b: add compatibles for Meson8 and Meson8m2
  net: ena: disable admin msix while working in polling mode
  net: ena: add missing unmap bars on device removal
  net: ena: add missing return when ena_com_get_io_handlers() fails
  net: ena: fix race condition between submit and completion admin command
  net: ena: fix rare uncompleted admin command false alarm
  iio: magnetometer: st_magn_spi: fix spi_device_id table
  sparc64: ldc abort during vds iso boot
  net: fec: Add a fec_enet_clear_ethtool_stats() stub for CONFIG_M5272
  sctp: fix recursive locking warning in sctp_do_peeloff
  bnx2x: Allow vfs to disable txvlan offload
  crypto: omap-sham - fix closing of hash with separate finalize call
  crypto: omap-sham - buffer handling fixes for hashing later
  geneve: add missing rx stats accounting
  stmmac: fix ptp header for GMAC3 hw timestamp
  coresight: tmc: Configure DMA mask appropriately
  coresight: Fix reference count for software sources
  pinctrl: meson-gxbb: remove non-existing pin GPIOX_22
  X.509: Fix error code in x509_cert_parse()
  xen: avoid type warning in xchg_xen_ulong
  skbuff: only inherit relevant tx_flags
  perf tests: Decompress kernel module before objdump
  perf tools: Decompress kernel module when reading DSO data
  net: emac: fix reset timeout with AR8035 phy
  Fix loop device flush before configure v3
  ARM: dts: armadillo800eva: Split LCD mux and gpio
  MIPS: kprobes: flush_insn_slot should flush only if probe initialised
  MIPS: mm: adjust PKMAP location
  MIPS: mm: fixed mappings: correct initialisation
  sched/deadline: Use the revised wakeup rule for suspending constrained dl tasks
  perf/core: Correct event creation with PERF_FORMAT_GROUP
  e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails
  KVM: nVMX: Update vmcs12->guest_linear_address on nested VM-exit
  nvme: fix hang in remove path
  nvme-pci: fix multiple ctrl removal scheduling
  ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull
  net: phy: avoid genphy_aneg_done() for PHYs without clause 22 support
  mceusb: sporadic RX truncation corruption fix
  cx25840: fix unchecked return values
  cxl: Unlock on error in probe
  igb: fix race condition with PTP_TX_IN_PROGRESS bits
  e1000e: fix race condition around skb_tstamp_tx()
  ARM: dts: qcom: ipq4019: fix i2c_0 node
  tags: honor COMPILED_SOURCE with apart output directory
  iwlwifi: fix min API version for 7265D, 3168, 8000 and 8265
  iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3
  iwlwifi: tt: move ucode_loaded check under mutex
  iwlwifi: mvm: Fix command queue number on d0i3 flow
  watchdog: f71808e_wdt: Add F71868 support
  iwlwifi: mvm: fix firmware debug restart recording
  perf report: Ensure the perf DSO mapping matches what libdw sees
  perf header: Set proper module name when build-id event found
  net/mlx4: Check if Granular QoS per VF has been enabled before updating QP qos_vport
  net/mlx4: Fix the check in attaching steering rules
  sit: reload iphdr in ipip6_rcv
  macsec: check return value of skb_to_sgvec always
  skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow
  ip6_tunnel: fix traffic class routing for tunnels
  bio-integrity: Do not allocate integrity context for bio w/o data
  Fix serial console on SNI RM400 machines
  cxgb4: fix incorrect cim_la output for T6
  powerpc/8xx: fix mpc8xx_get_irq() return on no irq
  drm/omap: fix tiled buffer stride calculations
  RDMA/hfi1: fix array termination by appending NULL to attr array
  RDMA/iw_cxgb4: Avoid touch after free error in ARP failure handlers
  net: phy: micrel: Restore led_mode and clk_sel on resume
  mISDN: Fix a sleep-in-atomic bug
  arm64: kernel: restrict /dev/mem read() calls to linear region
  qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M
  perf trace: Add mmap alias for s390
  ath10k: add BMI parameters to fix calibration from DT/pre-cal
  drm/amdkfd: NULL dereference involving create_process()
  powerpc/spufs: Fix coredump of SPU contexts
  clk: Fix __set_clk_rates error print-string
  clk: scpi: fix return type of __scpi_dvfs_round_rate
  KVM: SVM: do not zero out segment attributes if segment is unusable or not present
  mtd: nand: check ecc->total sanity in nand_scan_tail
  mtd: nand: gpmi: Fix gpmi_nand_init() error path
  dt-bindings: display: sun4i: Add allwinner,tcon-channel property
  drm/sun4i: Ignore the generic connectors for components
  clk: at91: fix clk-generated parenting
  net: freescale: fix potential null pointer dereference
  SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()
  rtc: interface: Validate alarm-time before handling rollover
  rtc: opal: Handle disabled TPO in opal_get_tpo_time()
  i40evf: fix merge error in older patch
  rtc: m41t80: fix SQW dividers override when setting a date
  cxgb4: Fix netdev_features flag
  cxgb4: FW upgrade fixes
  net/mlx5: avoid build warning for uniprocessor
  arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage
  backlight: Report error on failure
  dmaengine: imx-sdma: Handle return value of clk_prepare_enable
  powerpc/[booke|4xx]: Don't clobber TCR[WP] when setting TCR[DIE]
  ovl: filter trusted xattr for non-admin
  HID: i2c: Call acpi_device_fix_up_power for ACPI-enumerated devices
  netfilter: conntrack: don't call iter for non-confirmed conntracks
  x86/efi: Disable runtime services on kexec kernel if booted with efi=old_map
  hdlcdrv: Fix divide by zero in hdlcdrv_ioctl
  wl1251: check return from call to wl1251_acx_arp_ip_filter
  rt2x00: do not pause queue unconditionally on error path
  ASoC: Intel: sst: Fix the return value of 'sst_send_byte_stream_mrfld()'
  pinctrl: baytrail: Enable glitch filter for GPIOs used as interrupts
  backlight: tdo24m: Fix the SPI CS between transfers
  blk-mq: fix race between updating nr_hw_queues and switching io sched
  IB/rdmavt: Allocate CQ memory on the correct node
  gpio: label descriptors using the device name
  vfb: fix video mode and line_length being set when loaded
  mac80211: Fix setting TX power on monitor interfaces
  ACPI: EC: Fix debugfs_create_*() usage
  irqchip/gic-v3: Fix the driver probe() fail due to disabled GICC entry
  scsi: mpt3sas: Proper handling of set/clear of "ATA command pending" flag.
  scsi: libiscsi: Allow sd_shutdown on bad transport
  ASoC: Intel: cht_bsw_rt5645: Analog Mic support
  ASoC: Intel: Skylake: Disable clock gating during firmware and library download
  media: videobuf2-core: don't go out of the buffer range
  hwmon: (ina2xx) Make calibration register value fixed
  PM / devfreq: Fix potential NULL pointer dereference in governor_store
  VFS: close race between getcwd() and d_move()
  net/mlx4_en: Change default QoS settings
  ACPI / video: Default lcd_only to true on Win8-ready and newer machines
  rds; Reset rs->rs_bound_addr in rds_add_bound() failure path
  l2tp: fix missing print session offset info
  perf probe: Add warning message if there is unexpected event name
  thermal: power_allocator: fix one race condition issue for thermal_instances list
  ARM: dts: ls1021a: add "fsl,ls1021a-esdhc" compatible string to esdhc node
  i40iw: Correct Q1/XF object count equation
  i40iw: Fix sequence number for the first partial FPDU
  drm/msm: Take the mutex before calling msm_gem_new_impl
  net: llc: add lock_sock in llc_ui_bind to avoid a race condition
  KVM: nVMX: Fix handling of lmsw instruction
  KVM: X86: Fix preempt the preemption timer cancel
  PCI/msi: fix the pci_alloc_irq_vectors_affinity stub
  cpuhotplug: Link lock stacks for hotplug callbacks
  bonding: Don't update slave->link until ready to commit
  Input: elan_i2c - clear INT before resetting controller
  net: move somaxconn init from sysctl code
  tcp: better validation of received ack sequences
  ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path
  ext4: fix off-by-one on max nr_pages in ext4_find_unwritten_pgoff()
  fix race in drivers/char/random.c:get_reg()
  scsi: bnx2fc: fix race condition in bnx2fc_get_host_stats()
  ASoC: rsnd: SSI PIO adjust to 24bit mode
  pNFS/flexfiles: missing error code in ff_layout_alloc_lseg()
  netfilter: ctnetlink: fix incorrect nf_ct_put during hash resize
  perf report: Fix off-by-one for non-activation frames
  libceph: NULL deref on crush_decode() error path
  net: ieee802154: fix net_device reference release too early
  mlx5: fix bug reading rss_hash_type from CQE
  block: fix an error code in add_partition()
  selinux: do not check open permission on sockets
  net/mlx5: Tolerate irq_set_affinity_hint() failures
  gpio: crystalcove: Do not write regular gpio registers for virtual GPIOs
  sched/numa: Use down_read_trylock() for the mmap_sem
  perf/core: Fix error handling in perf_event_alloc()
  leds: pca955x: Correct I2C Functionality
  net/wan/fsl_ucc_hdlc: fix muram allocation error
  ray_cs: Avoid reading past end of buffer
  ARM: davinci: da8xx: Create DSP device only when assigned memory
  md-cluster: fix potential lock issue in add_new_disk
  ext4: handle the rest of ext4_mb_load_buddy() ENOMEM errors
  iio: light: rpr0521 poweroff for probe fails
  iio: hi8435: cleanup reset gpio
  iio: hi8435: avoid garbage event at first enable
  ASoC: simple-card: fix mic jack initialization
  xfrm: fix state migration copy replay sequence numbers
  selftests/powerpc: Fix TM resched DSCR test with some compilers
  ath5k: fix memory leak on buf on failed eeprom read
  powerpc/mm: Fix virt_addr_valid() etc. on 64-bit hash
  scsi: csiostor: fix use after free in csio_hw_use_fwconfig()
  mlxsw: spectrum: Avoid possible NULL pointer dereference
  sh_eth: Use platform device for printing before register_netdev()
  fsl/qe: add bit description for SYNL register for GUMR
  net/wan/fsl_ucc_hdlc: fix incorrect memory allocation
  net/wan/fsl_ucc_hdlc: fix unitialized variable warnings
  serial: sh-sci: Fix race condition causing garbage during shutdown
  serial: 8250: omap: Disable DMA for console UART
  USB: ene_usb6250: fix SCSI residue overwriting
  net: x25: fix one potential use-after-free issue
  USB: ene_usb6250: fix first command execution
  pxa_camera: fix module remove codepath for v4l2 clock
  usb: chipidea: properly handle host or gadget initialization failure
  ARM: dts: rockchip: fix rk322x i2s1 pinctrl error
  arp: honour gratuitous ARP _replies_
  neighbour: update neigh timestamps iff update is effective
  uio: fix incorrect memory leak cleanup
  ipmr: vrf: Find VIFs using the actual device
  ata: libahci: properly propagate return value of platform_get_irq()
  btrfs: fix incorrect error return ret being passed to mapping_set_error
  usb: dwc3: keystone: check return value
  KVM: arm64: Restore host physical timer access on hyp_panic()
  KVM: arm: Restore banked registers and physical timer access on hyp_panic()
  async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome()
  ipv6: avoid dad-failures for addresses with NODAD
  mdio: mux: fix device_node_continue.cocci warnings
  arm64: perf: Ignore exclude_hv when kernel is running in HYP
  i2c: mux: reg: put away the parent i2c adapter on probe failure
  ARM: dts: imx6qdl-wandboard: Fix audio channel swap
  powerpc/modules: If mprofile-kernel is enabled add it to vermagic
  x86/tsc: Provide 'tsc=unstable' boot parameter
  clk: renesas: rcar-gen2: Fix PLL0 on R-Car V2H and E2
  staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning
  ARM: dts: imx53-qsrb: Pulldown PMIC IRQ pin
  iio: pressure: zpa2326: report interrupted case as failure
  PowerCap: Fix an error code in powercap_register_zone()
  bus: brcmstb_gisb: correct support for 64-bit address output
  bus: brcmstb_gisb: Use register offsets with writes too
  SMB2: Fix share type handling
  mm, vmstat: Remove spurious WARN() during zoneinfo print
  vmxnet3: ensure that adapter is in proper state during force_close
  irqchip/mbigen: Fix the clear register offset calculation
  KVM: PPC: Book3S PR: Check copy_to/from_user return values
  Input: elantech - force relative mode on a certain module
  Input: elan_i2c - check if device is there before really probing
  mdio: mux: Correct mdio_mux_init error path issues
  netxen_nic: set rcode to the return status from the call to netxen_issue_cmd
  net: qca_spi: Fix alignment issues in rx path
  blk-mq: NVMe 512B/4K+T10 DIF/DIX format returns I/O error on dd with split op
  perf/callchain: Force USER_DS when invoking perf_callchain_user()
  CIFS: silence lockdep splat in cifs_relock_file()
  NFSv4.1: Work around a Linux server bug...
  qed: Correct doorbell configuration for !4Kb pages
  net/mlx4_en: Avoid adding steering rules with invalid ring
  s390: move _text symbol to address higher than zero
  pidns: disable pid allocation if pid_ns_prepare_proc() is failed in alloc_pid()
  drivers/misc/vmw_vmci/vmci_queue_pair.c: fix a couple integer overflow tests
  lockd: fix lockd shutdown race
  net: ethernet: ti: cpsw: adjust cpsw fifos depth for fullduplex flow control
  net: cdc_ncm: Fix TX zero padding
  ipmi_ssif: unlock on allocation failure
  ubi: fastmap: Fix slab corruption
  qlge: Avoid reading past end of buffer
  bna: Avoid reading past end of buffer
  mac80211: bail out from prep_connection() if a reconfig is ongoing
  af_key: Fix slab-out-of-bounds in pfkey_compile_policy.
  IB/srpt: Avoid that aborting a command triggers a kernel warning
  IB/srpt: Fix abort handling
  x86/boot: Declare error() as noreturn
  NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION
  ovl: persistent inode numbers for upper hardlinks
  x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
  x86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic()
  rtc: snvs: fix an incorrect check of return value
  md/raid5: make use of spin_lock_irq over local_irq_disable + spin_lock
  cfg80211: make RATE_INFO_BW_20 the default
  qed: Fix overriding of supported autoneg value.
  ANDROID: proc: add null check in proc_uid_init
  f2fs/fscrypt: updates to v4.17-rc1
  Revert "ANDROID: sched/tune: Initialize raw_spin_lock in boosted_groups"
  ANDROID: uid_sys_stats: Replace tasklist lock with RCU in uid_cputime_show
  ANDROID: arm64: mark kpti_install_ng_mappings as __nocfi

Conflicts:
	arch/arm64/kernel/perf_event.c
	drivers/gpu/drm/msm/msm_gem.c
	drivers/hwtracing/coresight/coresight-tmc.c
	drivers/hwtracing/coresight/coresight.c

Change-Id: I3a1bd6216f55601cff0a2b4344c480b2e1a771a6
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>