Merge remote-tracking branch '4.9/tmp-ffc99722' into HEAD

* 4.9/tmp-ffc99722:
  Linux 4.9.62
  x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
  x86/smpboot: Make optimization of delay calibration work correctly
  can: c_can: don't indicate triple sampling support for D_CAN
  can: ifi: Fix transmitter delay calculation
  can: sun4i: handle overrun in RX FIFO
  drm/bridge: adv7511: Re-write the i2c address before EDID probing
  drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID
  drm/bridge: adv7511: Rework adv7511_power_on/off() so they can be reused internally
  drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
  rbd: use GFP_NOIO for parent stat and data requests
  Input: elan_i2c - add ELAN060C to the ACPI table
  MIPS: AR7: Ensure that serial ports are properly set up
  MIPS: AR7: Defer registration of GPIO
  MIPS: BMIPS: Fix missing cbr address
  ASoC: sun4i-spdif: remove legacy dapm components
  tools: firmware: check for distro fallback udev cancel rule
  selftests: firmware: send expected errors to /dev/null
  MIPS: SMP: Fix deadlock & online race
  MIPS: Fix race on setting and getting cpu_online_mask
  MIPS: SMP: Use a completion event to signal CPU up
  MIPS: Fix CM region target definitions
  MIPS: microMIPS: Fix incorrect mask in insn_table_MM
  drm/i915: Do not rely on wm preservation for ILK watermarks
  ALSA: seq: Avoid invalid lockdep class warning
  ALSA: seq: Fix OSS sysex delivery in OSS emulation
  ARM: 8720/1: ensure dump_instr() checks addr_limit
  KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
  crypto: x86/sha256-mb - fix panic due to unaligned access
  crypto: x86/sha1-mb - fix panic due to unaligned access
  crypto: ccm - preserve the IV buffer
  workqueue: Fix NULL pointer dereference
  x86/uaccess, sched/preempt: Verify access_ok() context
  platform/x86: hp-wmi: Do not shadow error values
  platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
  KEYS: trusted: fix writing past end of buffer in trusted_read()
  KEYS: trusted: sanitize all key material
  cdc_ncm: Set NTB format again after altsetting switch for Huawei devices
  platform/x86: hp-wmi: Fix detection for dock and tablet mode
  net: dsa: select NET_SWITCHDEV
  clk: mvebu: adjust AP806 CPU clock frequencies to production chip
  IB/rxe: Fix reference leaks in memory key invalidation code
  wcn36xx: Don't use the destroyed hal_mutex
  s390/qeth: issue STARTLAN as first IPA command
  s390/qeth: fix retrieval of vipa and proxy-arp addresses
  ARM: dts: STiH410-family: fix wrong parent clock frequency
  IB/ipoib: Change list_del to list_del_init in the tx object
  sched/cputime, powerpc32: Fix stale scaled stime on context switch
  Input: mpr121 - set missing event capability
  Input: mpr121 - handle multiple bits change of status register
  s390/topology: make "topology=off" parameter work
  EDAC, amd64: Save and return err code from probe_one_instance()
  IPsec: do not ignore crypto err in ah4 input
  apparmor: fix undefined reference to `aa_g_hash_policy'
  rt2800usb: mark tx failure on timeout
  brcmfmac: setup wiphy bands after registering it first
  netfilter: nft_meta: deal with PACKET_LOOPBACK in netdev family
  usb: hcd: initialize hcd->flags to 0 when rm hcd
  libertas: fix improper return value
  serial: sh-sci: Fix register offsets for the IRDA serial port
  phy: increase size of MII_BUS_ID_SIZE and bus_id
  dt-bindings: Add vendor prefix for LEGO
  dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification
  iio: proximity: sx9500: claim direct mode during raw proximity reads
  iio: magnetometer: mag3110: claim direct mode during raw writes
  iio: pressure: ms5611: claim direct mode during oversampling changes
  iio: trigger: free trigger resource correctly
  drm: mali-dp: fix Lx_CONTROL register fields clobber
  crypto: vmx - disable preemption to enable vsx in aes_ctr.c
  arm64: dma-mapping: Only swizzle DMA ops for IOMMU_DOMAIN_DMA
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  cxl: Force psl data-cache flush during device shutdown
  powerpc/corenet: explicitly disable the SDHC controller on kmcoge4
  pinctrl: baytrail: Fix debugfs offset output
  iommu/arm-smmu-v3: Clear prior settings when updating STEs
  KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
  drm: drm_minor_register(): Clean up debugfs on failure
  clk: samsung: exynos5433: Add IDs for PHYCLK_MIPIDPHY0_* clocks
  PM / OPP: Error out on failing to add static OPPs for v1 bindings
  EDAC, amd64: Add x86cpuid sanity check during init
  dt-bindings: clockgen: Add compatible string for LS1012A
  ARM: dts: imx53-qsb-common: fix FEC pinmux config
  xen/netback: set default upper limit of tx/rx queues to 8
  sched/core: Add missing update_rq_clock() call in sched_move_task()
  PCI: mvebu: Handle changes to the bridge windows while enabled
  video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
  adv7604: Initialize drive strength to default when using DT

Conflicts:
	arch/arm64/mm/dma-mapping.c

Change-Id: I43c1e1ca95b7f96e265c404254545304816344ea
Signed-off-by: Kyle Yan <kyan@codeaurora.org>