The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/6f628933ad76b711269594adedab26c1f8e91808

commit 6f628933ad76b711269594adedab26c1f8e91808
Author: Guenter Roeck <groeck@chromium.org>
Date: Sat Dec 22 16:36:28 2018

CHROMIUM: Merge 'v4.19.12' into chromeos-4.19

Merge of v4.19.12 into chromeos-4.19

Conflicts:
    drivers/gpu/drm/msm/msm_iommu.c

Changelog:
----------------------------------------------------------------
Abhinav Kumar (1):
      drm/msm/dsi: configure VCO rate for 10nm PLL driver

Adamski, Krzysztof (Nokia - PL/Wroclaw) (1):
      i2c: axxia: properly handle master timeout

Alexei Starovoitov (1):
      bpf: check pending signals while verifying programs

Alexey Khoroshilov (1):
      mac80211_hwsim: fix module init error paths for netlink

Anderson Luiz Alves (1):
      mv88e6060: disable hardware level MAC learning

Baruch Siach (2):
      net: mvpp2: fix detection of 10G SFP modules
      net: mvpp2: fix phylink handling of invalid PHY modes

Cathy Avery (1):
      scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload

Chris Cole (1):
      ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling

Christian König (2):
      drm/ttm: fix LRU handling in ttm_buffer_object_transfer
      drm/amdgpu: wait for IB test on first device open

Dan Carpenter (3):
      drm/msm/gpu: Fix a couple memory leaks in debugfs
      clk: mvebu: Off by one bugs in cp110_of_clk_get()
      clk: mmp: Off by one in mmp_clk_add()

Dan Williams (2):
      tools/testing/nvdimm: Align test resources to 128M
      acpi/nfit: Fix user-initiated ARS to be "ARS-long" rather than "ARS-short"

Dave Kleikamp (1):
      nfs: don't dirty kernel pages read by direct-io

David Miller (1):
      bpf: Fix verifier log string check for bad alignment.

Dmitry Bogdanov (1):
      net: aquantia: fix rx checksum offload bits

Evan Quan (1):
      drm/amd/powerplay: issue pre-display settings for display change event

Fred Herard (1):
      scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset

Greg Kroah-Hartman (1):
      Linux 4.19.12

Guenter Roeck (1):
      Merge remote-tracking branch 'origin/linux/v4.19.12' into merge/chromeos-4.19-v4.19.12

Hans de Goede (1):
      i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node

Ido Schimmel (1):
      mlxsw: spectrum_switchdev: Fix VLAN device deletion via ioctl

Israel Rukshin (1):
      nvmet-rdma: fix response use after free

James Smart (1):
      nvme: validate controller state before rescheduling keep alive

James Zhu (1):
      drm/amdgpu/vcn: Update vcn.cur_state during suspend

Jose Abreu (1):
      ARC: io.h: Implement reads{x}()/writes{x}()

Juha-Matti Tilli (1):
      libata: whitelist all SAMSUNG MZ7KM* solid-state disks

Kunihiko Hayashi (1):
      net: ethernet: ave: Replace NET_IP_ALIGN with AVE_FRAME_HEADROOM

Martin KaFai Lau (1):
      tools/bpf: fix two test_btf unit test cases

Masahiro Yamada (2):
      i2c: uniphier: fix violation of tLOW requirement for Fast-mode
      i2c: uniphier-f: fix violation of tLOW requirement for Fast-mode

Matteo Croce (1):
      macvlan: return correct error value

Michael J. Ruhl (1):
      IB/hfi1: Remove race conditions in user_sdma send path

Nathan Jones (1):
      ARM: 8816/1: dma-mapping: fix potential uninitialized return

Nicolas Saenz Julienne (1):
      ethernet: fman: fix wrong of_node_put() in probe function

Omar Sandoval (1):
      Btrfs: fix missing delayed iputs on unmount

Pan Bian (1):
      liquidio: read sc->iq_no before release sc

Peter Zijlstra (2):
      locking/qspinlock: Re-order code
      locking/qspinlock, x86: Provide liveness guarantee

Rob Clark (1):
      drm/msm: fix handling of cmdstream offset

Roman Li (1):
      drm/amd/display: Fix 6x4K displays light-up on Vega20 (v2)

Russell King (1):
      thermal: armada: fix legacy validity test sense

Saeed Mahameed (1):
      net/mlx4_en: Fix build break when CONFIG_INET is off

Sam Bobroff (1):
      drm/ast: Fix connector leak during driver unload

Sean Paul (2):
      drm/msm: Grab a vblank reference when waiting for commit_done
      drm/msm: dpu: Don't set legacy plane->crtc pointer

Sharat Masetty (1):
      drm/msm: Fix task dump in gpu recovery

Stefan Hajnoczi (1):
      vhost/vsock: fix reset orphans race with close timeout

Steve French (1):
      cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)

Teika Kazura (1):
      Input: synaptics - enable SMBus for HP 15-ay000

Thierry Reding (1):
      net: stmmac: Move debugfs init/exit to ->probe()/->remove()

Todor Tomov (1):
      drm/msm/hdmi: Enable HPD after HDMI IRQ is set up

Toni Peltonen (1):
      bonding: fix 802.3ad state sent to partner when unbinding slave

Tony Lindgren (1):
      Input: omap-keypad - fix keyboard debounce configuration

Trond Myklebust (1):
      SUNRPC: Fix a potential race in xprt_connect()

Vitaly Kuznetsov (1):
      Input: hyper-v - fix wakeup from suspend-to-idle

Vladimir Murzin (1):
      ARM: 8815/1: V7M: align v7m_dma_inv_range() with v7 counterpart

Wen Yang (1):
      drm/msm: Fix error return checking

Wolfram Sang (1):
      i2c: rcar: check bus state before reinitializing

Yangtao Li (4):
      sbus: char: add of_node_put()
      drivers/sbus/char: add of_node_put()
      drivers/tty: add missing of_node_put()
      ide: pmac: add of_node_put()

YiFei Zhu (1):
      x86/earlyprintk/efi: Fix infinite loop on some screen widths

Yonghong Song (1):
      tools/bpf: add addition type tests to test_btf

YueHaibing (1):
      drm/msm: dpu: Fix "WARNING: invalid free of devm_ allocated data"

 Makefile                                           |   2 +-
 arch/arc/include/asm/io.h                          |  72 ++++
 arch/arm/mm/cache-v7.S                             |   8 +-
 arch/arm/mm/cache-v7m.S                            |  14 +-
 arch/arm/mm/dma-mapping.c                          |   2 +-
 arch/x86/include/asm/qspinlock.h                   |  21 ++
 arch/x86/platform/efi/early_printk.c               |   2 +-
 drivers/acpi/nfit/core.c                           |   2 +-
 drivers/ata/libata-core.c                          |   1 +
 drivers/clk/mmp/clk.c                              |   2 +-
 drivers/clk/mvebu/cp110-system-controller.c        |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |   6 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |   3 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |   2 +
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c        |   3 +
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c       |   2 -
 drivers/gpu/drm/ast/ast_fb.c                       |   1 +
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |   2 -
 drivers/gpu/drm/msm/msm_iommu.c                    |   2 +-
 drivers/gpu/drm/ttm/ttm_bo_util.c                  |   4 +-
 drivers/hid/hid-hyperv.c                           |   2 +-
 drivers/i2c/busses/i2c-axxia.c                     |  40 ++-
 drivers/i2c/busses/i2c-rcar.c                      |   9 +-
 drivers/i2c/busses/i2c-scmi.c                      |  10 +-
 drivers/i2c/busses/i2c-uniphier-f.c                |  19 +-
 drivers/i2c/busses/i2c-uniphier.c                  |   8 +-
 drivers/ide/pmac.c                                 |   1 +
 drivers/infiniband/hw/hfi1/user_sdma.c             |  24 +-
 drivers/infiniband/hw/hfi1/user_sdma.h             |   9 +-
 drivers/input/keyboard/omap4-keypad.c              |  18 +-
 drivers/input/mouse/synaptics.c                    |   1 +
 drivers/input/serio/hyperv-keyboard.c              |   2 +-
 drivers/net/bonding/bond_3ad.c                     |   3 +
 drivers/net/dsa/mv88e6060.c                        |  10 +-
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c  |   2 +-
 drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c  |   4 +-
 drivers/net/ethernet/freescale/fman/fman.c         |   5 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c    |  34 +-
 drivers/net/ethernet/mellanox/mlx4/Kconfig         |   2 +-
 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |  10 +-
 drivers/net/ethernet/socionext/sni_ave.c           |  14 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  23 +-
 drivers/net/macvlan.c                              |   7 +-
 drivers/net/wireless/mac80211_hwsim.c              |  12 +-
 drivers/nvme/host/core.c                           |  10 +-
 drivers/nvme/target/rdma.c                         |   3 +-
 drivers/sbus/char/display7seg.c                    |   1 +
 drivers/sbus/char/envctrl.c                        |   2 +
 drivers/scsi/libiscsi.c                            |   4 +-
 drivers/scsi/vmw_pvscsi.c                          |   4 +-
 drivers/thermal/armada_thermal.c                   |   2 +-
 drivers/tty/serial/suncore.c                       |   1 +
 drivers/vhost/vsock.c                              |  22 +-
 fs/btrfs/disk-io.c                                 |  51 +--
 fs/cifs/Kconfig                                    |   2 +-
 fs/nfs/direct.c                                    |   9 +-
 kernel/bpf/verifier.c                              |   3 +
 kernel/locking/qspinlock.c                         |  71 ++--
 net/sunrpc/xprt.c                                  |  11 +-
 tools/testing/nvdimm/test/nfit.c                   |  35 +-
 tools/testing/selftests/bpf/test_btf.c             | 375 ++++++++++++++++++++-
 tools/testing/selftests/bpf/test_verifier.c        |   2 +-
 62 files changed, 831 insertions(+), 201 deletions(-)

BUG= chromium:917217 
TEST=Build and test on various affected systems

Change-Id: I35f5e2c84887ab3c48362cfa0790378cfdcf6a02
Signed-off-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/6f628933ad76b711269594adedab26c1f8e91808/drivers/gpu/drm/msm/msm_iommu.c