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

commit 1963bb4966d1ba4faa7670106c21fb2ddc2e4c37
Author: Guenter Roeck <groeck@chromium.org>
Date: Mon Mar 19 21:09:09 2018

CHROMIUM: Merge 'v4.14.27' into chromeos-4.14

Merge of v4.14.27 into chromeos-4.14

Conflicts:
    arch/x86/Makefile
    Makefile

Changes applied on top of 'v4.14.27' prior to merge:
    753e90bf5264 Revert "drm/i915: Fix rsvd2 mask when out-fence is returned"
    87e6057f37e5 Revert "drm/i915: Clear the in-use marker on execbuf failure"
    2491e91f0282 Revert "drm/i915: Disable DC states around GMBUS on GLK"
    5fe9f15081ad Revert "drm/i915: Update watermark state correctly in sanitize_watermarks"
    5080be5f4d26 Revert "drm/i915: Try EDID bitbanging on HDMI after failed read"
    cc2f14063e5a Revert "drm/i915/perf: fix perf stream opening lock"
    d7561305e3ec Revert "drm/i915: Always call to intel_display_set_init_power() in resume_early."

Changelog:
----------------------------------------------------------------
Adrian Hunter (1):
      perf tools: Fix trigger class trigger_on()

Alex Deucher (6):
      drm/amd/powerplay/smu7: allow mclk switching with no displays
      drm/amd/powerplay/vega10: allow mclk switching with no displays
      Revert "drm/radeon/pm: autoswitch power state when in balanced mode"
      drm/amdgpu: used cached pcie gen info for SI (v2)
      drm/radeon: fix KV harvesting
      drm/amdgpu: fix KV harvesting

Ard Biesheuvel (1):
      arm64: mm: fix thinko in non-global page table attribute check

Arnd Bergmann (4):
      watchdog: hpwdt: fix unused variable warning
      ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
      tpm: remove unused variables
      dm bufio: avoid false-positive Wmaybe-uninitialized warning

Azhar Shaikh (2):
      tpm_tis: Move ilb_base_addr to tpm_tis_data
      tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()

Bart Van Assche (1):
      scsi: core: Avoid that ATA error handling can trigger a kernel hang or oops

Ben Crocker (1):
      drm/radeon: insist on 32-bit DMA for Cedar on PPC64/PPC64LE

Benjamin Berg (1):
      ALSA: hda/realtek: Limit mic boost on T480

Chintan Patel (1):
      ASoC: Intel: Skylake: Fix jack name format substitution

Chris Fries (1):
      kbuild: Set KBUILD_CFLAGS before incl. arch Makefile

Chris Wilson (1):
      drm/i915: Clear the in-use marker on execbuf failure

Colin Ian King (2):
      MIPS: ath25: Check for kzalloc allocation failure
      MIPS: OCTEON: irq: Check for null return on kzalloc allocation

Cong Wang (1):
      netfilter: ipt_CLUSTERIP: fix a race condition of proc file creation

Dan Williams (2):
      nospec: Kill array_index_nospec_mask_check()
      nospec: Include <asm/barrier.h> dependency

Daniel Vacek (1):
      mm/memblock.c: hardcode the end_pfn being -1

Daniele Ceraolo Spurio (1):
      drm/i915: Fix rsvd2 mask when out-fence is returned

David Hildenbrand (1):
      KVM: s390: fix memory overwrites when not using SCA entries

David Woodhouse (3):
      Revert "x86/retpoline: Simplify vmexit_fill_RSB()"
      x86/speculation: Use IBRS if available before calling into firmware
      x86/retpoline: Support retpoline builds with Clang

Davide Caratti (1):
      net/smc: fix NULL pointer dereference on sock_create_kern() error path

Dennis Wassenberg (3):
      ALSA: hda/realtek - Make dock sound work on ThinkPad L570
      ALSA: hda: add dock and led support for HP EliteBook 820 G3
      ALSA: hda: add dock and led support for HP ProBook 640 G2

Dominik Brodowski (2):
      x86/entry: Reduce the code footprint of the 'idtentry' macro
      x86/entry/64: Use 'xorl' for faster register clearing

Eric Dumazet (3):
      netfilter: xt_hashlimit: fix lock imbalance
      netfilter: IDLETIMER: be syzkaller friendly
      netfilter: use skb_to_full_sk in ip6_route_me_harder

Eric Huang (1):
      drm/amd/powerplay: fix power over limit on Fiji

Fabrice Gasnier (1):
      regulator: stm32-vrefbuf: fix check on ready flag

Florian Westphal (4):
      netfilter: add back stackpointer size checks
      netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
      netfilter: bridge: ebt_among: add missing match size checks
      netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt

Francis Deslauriers (1):
      x86/kprobes: Fix kernel crash when probing .entry_trampoline code

Giridhar Malavali (2):
      scsi: qla2xxx: Defer processing of GS IOCB calls
      scsi: qla2xxx: Remove aborting ELS IOCB call issued as part of timeout.

Greg Kroah-Hartman (1):
      Linux 4.14.27

Guenter Roeck (8):
      Revert "drm/i915: Always call to intel_display_set_init_power() in resume_early."
      Revert "drm/i915/perf: fix perf stream opening lock"
      Revert "drm/i915: Try EDID bitbanging on HDMI after failed read"
      Revert "drm/i915: Update watermark state correctly in sanitize_watermarks"
      Revert "drm/i915: Disable DC states around GMBUS on GLK"
      Revert "drm/i915: Clear the in-use marker on execbuf failure"
      Revert "drm/i915: Fix rsvd2 mask when out-fence is returned"
      Merge remote-tracking branch 'origin/linux/v4.14.27' into merge/chromeos-4.14-v4.14.27

Hui Wang (1):
      ALSA: hda - Fix a wrong FIXUP for alc289 on Dell machines

Ilia Mirkin (1):
      drm/nouveau: prefer XBGR2101010 for addfb ioctl

Ingo Molnar (1):
      x86/speculation: Move firmware_restrict_branch_speculation_*() from C to CPP

James Hogan (1):
      kbuild: Handle builtin dtb file names containing hyphens

James Zhu (2):
      drm/amdgpu:Correct max uvd handles
      drm/amdgpu:Always save uvd vcpu_bo in VM Mode

Jan Beulich (3):
      x86/asm: Improve how GEN_*_SUFFIXED_RMWcc() specify clobbers
      x86/LDT: Avoid warning in 32-bit builds with older gcc
      x86-64/realmode: Add instruction suffix

Jann Horn (1):
      x86/mm: Remove stale comment about KMEMCHECK

Jason Gunthorpe (1):
      IB/uverbs: Improve lockdep_check

Javier Martinez Canillas (2):
      tpm: delete the TPM_TIS_CLK_ENABLE flag
      tpm: only attempt to disable the LPC CLKRUN if is already enabled

Jerry Hoemann (3):
      watchdog: hpwdt: SMBIOS check
      watchdog: hpwdt: Check source of NMI
      watchdog: hpwdt: Remove legacy NMI sourcing.

Josh Poimboeuf (2):
      objtool: Fix another switch table detection issue
      objtool: Fix 32-bit build

Justin Chen (1):
      MIPS: BMIPS: Do not mask IPIs during suspend

Kailang Yang (2):
      ALSA: hda/realtek - Add support headset mode for DELL WYSE
      ALSA: hda/realtek - Add headset mode support for Dell laptop

Kees Cook (1):
      lib/bug.c: exclude non-BUG/WARN exceptions from report_bug()

Koen Vandeputte (1):
      PCI: dwc: Fix enumeration end when reaching root subordinate

Konrad Rzeszutek Wilk (1):
      x86/spectre_v2: Don't check microcode versions when running under hypervisors

Leon Romanovsky (3):
      RDMA/ucma: Limit possible option size
      RDMA/ucma: Check that user doesn't overflow QP state
      RDMA/mlx5: Fix integer overflow while resizing CQ

Lionel Landwerlin (1):
      drm/i915/perf: fix perf stream opening lock

Lukas Wunner (5):
      workqueue: Allow retrieval of current task's work struct
      drm: Allow determining if current task is output poll worker
      drm/nouveau: Fix deadlock on runtime suspend
      drm/radeon: Fix deadlock on runtime suspend
      drm/amdgpu: Fix deadlock on runtime suspend

Maarten Lankhorst (2):
      drm/i915: Update watermark state correctly in sanitize_watermarks
      drm/i915: Always call to intel_display_set_init_power() in resume_early.

Masahiro Yamada (3):
      kbuild: move "_all" target out of $(KBUILD_SRC) conditional
      kbuild: re-order the code to not parse unnecessary variables
      kbuild: move cc-option and cc-disable-warning after incl. arch Makefile

Matthew Wilcox (1):
      Documentation/sphinx: Fix Directive import error

Michael Lyle (1):
      bcache: don't attach backing with duplicate UUID

Paolo Abeni (2):
      netfilter: x_tables: fix missing timer initialization in xt_LED
      netfilter: nat: cope with negative port range

Parav Pandit (1):
      IB/core: Fix missing RDMA cgroups release in case of failure to register device

Paul Burton (2):
      dt-bindings: Document mti,mips-cpc binding
      MIPS: CPC: Map registers using DT in mips_cpc_default_phys_base()

Peter Zijlstra (8):
      x86/speculation, objtool: Annotate indirect calls/jumps for objtool
      x86/paravirt, objtool: Annotate indirect calls
      x86/boot, objtool: Annotate indirect jump in secondary_startup_64()
      x86/mm/sme, objtool: Annotate indirect call in sme_encrypt_execute()
      objtool: Use existing global variables for options
      objtool: Add retpoline validation
      objtool: Add module specific retpoline rules
      objtool, retpolines: Integrate objtool with retpoline support more closely

Quinn Tran (15):
      scsi: qla2xxx: Fix system crash for Notify ack timeout handling
      scsi: qla2xxx: Fix gpnid error processing
      scsi: qla2xxx: Move session delete to driver work queue
      scsi: qla2xxx: Skip IRQ affinity for Target QPairs
      scsi: qla2xxx: Fix re-login for Nport Handle in use
      scsi: qla2xxx: Retry switch command on time out
      scsi: qla2xxx: Serialize GPNID for multiple RSCN
      scsi: qla2xxx: Fix login state machine stuck at GPDB
      scsi: qla2xxx: Fix Relogin being triggered too fast
      scsi: qla2xxx: Fix PRLI state check
      scsi: qla2xxx: Fix abort command deadlock due to spinlock
      scsi: qla2xxx: Replace fcport alloc with qla2x00_alloc_fcport
      scsi: qla2xxx: Fix scan state field for fcport
      scsi: qla2xxx: Clear loop id after delete
      scsi: qla2xxx: Fix system crash in qlt_plogi_ack_unref

Rex Zhu (1):
      drm/amdgpu: Notify sbios device ready before send request

Ross Zwisler (1):
      loop: Fix lost writes caused by missing flag

Sawan Chandak (1):
      scsi: qla2xxx: Fix NPIV host cleanup in target mode

Sergey Gorenko (1):
      IB/mlx5: Fix incorrect size of klms in the memory region

Seunghun Han (1):
      x86/MCE: Serialize sysfs changes

Stefan Brüns (1):
      drm/i915: Try EDID bitbanging on HDMI after failed read

Takashi Iwai (3):
      ALSA: hda/realtek - Fix dock line-out volume on Dell Precision 7520
      ALSA: seq: Don't allow resizing pool in use
      ALSA: seq: More protection for concurrent write and ioctl races

Tang Junhui (1):
      bcache: fix crashes in duplicate cache device register

Tiwei Bie (1):
      virtio_ring: fix num_free handling in error case

Tony Luck (1):
      x86/MCE: Save microcode revision in machine check records

Trond Myklebust (3):
      NFS: Fix an incorrect type in struct nfs_direct_req
      pNFS: Prevent the layout header refcount going to zero in pnfs_roc()
      NFS: Fix unstable write completion

Ville Syrjälä (1):
      drm/i915: Disable DC states around GMBUS on GLK

Vinod Koul (1):
      ASoC: Intel: kbl: fix jack name

Zhang Bo (1):
      Input: matrix_keypad - fix race when disabling interrupts

himanshu.madhani@cavium.com (4):
      scsi: qla2xxx: Fix memory leak in dual/target mode
      scsi: qla2xxx: Fix NULL pointer crash due to active timer for ABTS
      scsi: qla2xxx: Fix NULL pointer crash due to probe failure
      scsi: qla2xxx: Fix recursion while sending terminate exchange

 .../devicetree/bindings/power/mti,mips-cpc.txt     |   8 +
 Documentation/sphinx/kerneldoc.py                  |   3 +-
 MAINTAINERS                                        |   1 +
 Makefile                                           | 259 ++++++-----
 arch/arm/mach-omap2/omap-secure.c                  |   2 +
 arch/arm64/mm/mmu.c                                |   8 +-
 arch/mips/ath25/board.c                            |   2 +
 arch/mips/cavium-octeon/octeon-irq.c               |   2 +
 arch/mips/kernel/mips-cpc.c                        |  13 +
 arch/mips/kernel/smp-bmips.c                       |   8 +-
 arch/s390/kvm/kvm-s390.c                           |   1 +
 arch/x86/Kconfig                                   |   1 +
 arch/x86/Makefile                                  |  10 +-
 arch/x86/entry/calling.h                           |  27 +-
 arch/x86/entry/entry_32.S                          |   3 +-
 arch/x86/entry/entry_64.S                          |  21 +-
 arch/x86/entry/entry_64_compat.S                   |  54 +--
 arch/x86/include/asm/apm.h                         |   6 +
 arch/x86/include/asm/asm-prototypes.h              |   3 -
 arch/x86/include/asm/cpufeatures.h                 |   1 +
 arch/x86/include/asm/efi.h                         |  17 +-
 arch/x86/include/asm/mmu_context.h                 |   1 +
 arch/x86/include/asm/nospec-branch.h               | 138 +++++-
 arch/x86/include/asm/paravirt.h                    |  17 +-
 arch/x86/include/asm/paravirt_types.h              |   5 +-
 arch/x86/include/asm/refcount.h                    |   4 +-
 arch/x86/include/asm/rmwcc.h                       |  16 +-
 arch/x86/include/asm/sections.h                    |   1 +
 arch/x86/include/uapi/asm/mce.h                    |   1 +
 arch/x86/kernel/cpu/bugs.c                         |  12 +-
 arch/x86/kernel/cpu/intel.c                        |   7 +
 arch/x86/kernel/cpu/mcheck/mce.c                   |  26 +-
 arch/x86/kernel/head_64.S                          |   2 +
 arch/x86/kernel/kprobes/core.c                     |  10 +-
 arch/x86/kernel/vmlinux.lds.S                      |   2 +
 arch/x86/lib/Makefile                              |   1 -
 arch/x86/lib/retpoline.S                           |  56 ---
 arch/x86/mm/fault.c                                |   4 -
 arch/x86/mm/mem_encrypt_boot.S                     |   2 +
 arch/x86/realmode/rm/trampoline_64.S               |   2 +-
 drivers/block/loop.c                               |   2 +-
 drivers/char/tpm/tpm-interface.c                   |   6 +
 drivers/char/tpm/tpm_tis.c                         | 108 -----
 drivers/char/tpm/tpm_tis_core.c                    | 121 ++++-
 drivers/char/tpm/tpm_tis_core.h                    |  16 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           |   3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c     |  58 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |  13 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |  30 +-
 drivers/gpu/drm/amd/amdgpu/si.c                    |  22 +-
 drivers/gpu/drm/amd/amdgpu/si_dpm.c                |  50 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |  18 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |  11 +-
 drivers/gpu/drm/drm_framebuffer.c                  |   4 +
 drivers/gpu/drm/drm_probe_helper.c                 |  20 +
 drivers/gpu/drm/nouveau/nouveau_connector.c        |  18 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |   1 +
 drivers/gpu/drm/radeon/cik.c                       |  31 +-
 drivers/gpu/drm/radeon/radeon_connectors.c         |  74 ++-
 drivers/gpu/drm/radeon/radeon_device.c             |   4 +
 drivers/gpu/drm/radeon/radeon_pm.c                 |   6 +-
 drivers/infiniband/core/device.c                   |   6 +-
 drivers/infiniband/core/rdma_core.c                |  12 +-
 drivers/infiniband/core/ucma.c                     |   6 +
 drivers/infiniband/hw/mlx5/cq.c                    |   7 +-
 drivers/infiniband/hw/mlx5/mr.c                    |   2 +-
 drivers/input/keyboard/matrix_keypad.c             |   4 +-
 drivers/md/bcache/super.c                          |  27 +-
 drivers/md/dm-bufio.c                              |  16 +-
 drivers/pci/dwc/pcie-designware-host.c             |   2 +-
 drivers/regulator/stm32-vrefbuf.c                  |   2 +-
 drivers/scsi/hosts.c                               |   3 -
 drivers/scsi/qla2xxx/qla_def.h                     |  49 +-
 drivers/scsi/qla2xxx/qla_gs.c                      |  72 ++-
 drivers/scsi/qla2xxx/qla_init.c                    |  64 ++-
 drivers/scsi/qla2xxx/qla_iocb.c                    |  13 -
 drivers/scsi/qla2xxx/qla_isr.c                     |   7 +-
 drivers/scsi/qla2xxx/qla_mbx.c                     |   3 +-
 drivers/scsi/qla2xxx/qla_mid.c                     |  42 +-
 drivers/scsi/qla2xxx/qla_os.c                      |  51 ++-
 drivers/scsi/qla2xxx/qla_target.c                  |  26 +-
 drivers/scsi/scsi_error.c                          |   5 +-
 drivers/scsi/scsi_lib.c                            |   2 +
 drivers/virtio/virtio_ring.c                       |   2 -
 drivers/watchdog/hpwdt.c                           | 507 +--------------------
 fs/nfs/direct.c                                    |   2 +-
 fs/nfs/pnfs.c                                      |  13 +-
 fs/nfs/write.c                                     |  83 ++--
 include/drm/drm_crtc_helper.h                      |   1 +
 include/drm/drm_drv.h                              |   1 +
 include/linux/nospec.h                             |  23 +-
 include/linux/tpm.h                                |   1 +
 include/linux/workqueue.h                          |   1 +
 include/scsi/scsi_cmnd.h                           |   3 +
 include/scsi/scsi_host.h                           |   2 -
 kernel/workqueue.c                                 |  16 +
 lib/bug.c                                          |   2 +
 mm/memblock.c                                      |  10 +-
 net/bridge/netfilter/ebt_among.c                   |  21 +-
 net/bridge/netfilter/ebtables.c                    |  13 +-
 net/ipv4/netfilter/arp_tables.c                    |   4 +
 net/ipv4/netfilter/ip_tables.c                     |   7 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |  12 +-
 net/ipv6/netfilter.c                               |   9 +-
 net/ipv6/netfilter/ip6_tables.c                    |   4 +
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c           |   4 +
 net/netfilter/nf_nat_proto_common.c                |   7 +-
 net/netfilter/xt_IDLETIMER.c                       |   9 +-
 net/netfilter/xt_LED.c                             |  12 +-
 net/netfilter/xt_hashlimit.c                       |   2 +-
 net/smc/af_smc.c                                   |   4 +-
 scripts/Makefile.build                             |   8 +
 scripts/Makefile.lib                               |   8 +-
 sound/core/seq/seq_clientmgr.c                     |  21 +-
 sound/core/seq/seq_fifo.c                          |   2 +-
 sound/core/seq/seq_memory.c                        |  14 +-
 sound/core/seq/seq_memory.h                        |   3 +-
 sound/pci/hda/patch_conexant.c                     |   2 +
 sound/pci/hda/patch_realtek.c                      |  45 +-
 .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c  |   2 +
 tools/objtool/builtin-check.c                      |   6 +-
 tools/objtool/builtin-orc.c                        |   6 +-
 tools/objtool/builtin.h                            |   5 +
 tools/objtool/check.c                              |  93 +++-
 tools/objtool/check.h                              |   3 +-
 tools/perf/util/trigger.h                          |   9 +-
 126 files changed, 1434 insertions(+), 1362 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/mti,mips-cpc.txt

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

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

[modify] https://crrev.com/1963bb4966d1ba4faa7670106c21fb2ddc2e4c37/arch/x86/Makefile
[modify] https://crrev.com/1963bb4966d1ba4faa7670106c21fb2ddc2e4c37/Makefile