Merge android-4.14.54 (a6d69138) into msm-4.14

* remotes/origin/tmp-a6d69138:
  Linux 4.14.54
  net: dsa: b53: Add BCM5389 support
  net/sonic: Use dma_mapping_error()
  platform/x86: asus-wmi: Fix NULL pointer dereference
  sched/core: Require cpu_active() in select_task_rq(), for user tasks
  sched/core: Fix rules for running on online && !active CPUs
  fs: clear writeback errors in inode_init_always
  perf bpf: Fix NULL return handling in bpf__prepare_load()
  perf test: "Session topology" dumps core on s390
  net: qmi_wwan: Add Netgear Aircard 779S
  atm: zatm: fix memcmp casting
  iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs
  ipvs: fix buffer overflow with sync daemon and service
  netfilter: nft_limit: fix packet ratelimiting
  s390/dasd: use blk_mq_rq_from_pdu for per request data
  netfilter: ebtables: handle string from userspace with care
  afs: Fix directory permissions check
  xfrm6: avoid potential infinite loop in _decode_session6()
  mtd: rawnand: fix return value check for bad block status
  ARM: dts: imx6q: Use correct SDMA script for SPI5 core
  netfilter: nf_tables: use WARN_ON_ONCE instead of BUG_ON in nft_do_chain()
  netfilter: ip6t_rpfilter: provide input interface for route lookup
  netfilter: don't set F_IFACE on ipv6 fib lookups
  md: remove special meaning of ->quiesce(.., 2)
  md: allow metadata update while suspending.
  md: use mddev_suspend/resume instead of ->quiesce()
  md: move suspend_hi/lo handling into core md code
  md: don't call bitmap_create() while array is quiesced.
  md: always hold reconfig_mutex when calling mddev_suspend()
  netfilter: nf_tables: fix NULL-ptr in nf_tables_dump_obj()
  netfilter: nf_tables: add missing netlink attrs to policies
  netfilter: nf_tables: fix memory leak on error exit return
  netfilter: nf_tables: increase nft_counters_enabled in nft_chain_stats_replace()
  netfilter: nf_tables: disable preemption in nft_update_chain_stats()
  netfilter: nft_meta: fix wrong value dereference in nft_meta_set_eval
  netfilter: nf_tables: bogus EBUSY in chain deletions
  netfilter: nf_tables: don't assume chain stats are set when jumplabel is set
  netfilter: nft_compat: fix handling of large matchinfo size
  netfilter: nft_compat: prepare for indirect info storage
  netfilter: nf_tables: nft_compat: fix refcount leak on xt module
  drm/i915: Enable provoking vertex fix on Gen9 systems.
  drm/amdgpu: Refactor amdgpu_vram_mgr_bo_invisible_size helper
  drm/amdgpu: Use kvmalloc_array for allocating VRAM manager nodes array
  drm/atmel-hlcdc: check stride values in the first plane
  drm/qxl: Call qxl_bo_unref outside atomic context
  drm/amdgpu: fix the missed vcn fw version report
  drm/amdgpu: Add APU support in vi_set_vce_clocks
  drm/amdgpu: Add APU support in vi_set_uvd_clocks
  vt: prevent leaking uninitialized data to userspace via /dev/vcs*
  serdev: fix memleak on module unload
  serial: 8250_pci: Remove stalled entries in blacklist
  staging: android: ion: Return an ERR_PTR in ion_map_kernel
  n_tty: Access echo_* variables carefully.
  n_tty: Fix stall at n_tty_receive_char_special().
  xhci: Fix kernel oops in trace_xhci_free_virt_device
  usb: typec: ucsi: Fix for incorrect status data issue
  usb: typec: ucsi: acpi: Workaround for cache mode issue
  acpi: Add helper for deactivating memory region
  usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub
  USB: serial: cp210x: add Silicon Labs IDs for Windows Update
  USB: serial: cp210x: add CESINEL device ids
  usb: cdc_acm: Add quirk for Uniden UBC125 scanner

Conflicts:
	kernel/sched/core.c

Change-Id: I3013b90524ff80708423429a3715b1bdf1f9ad4c
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>