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

commit 312ce6dd19d109d0bfe93100664ae122274d8f77
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Jun 05 16:18:59 2018

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

Merge of v4.14.48 into chromeos-4.14

Changelog:
----------------------------------------------------------------
Aaron Ma (1):
      Input: synaptics - add Intertouch support on X1 Carbon 6th and X280

Al Viro (1):
      fix io_destroy()/aio_complete() race

Alexander Shishkin (2):
      stm class: Use vmalloc for the master map
      intel_th: Use correct device when freeing buffers

Bart Van Assche (1):
      scsi: scsi_transport_srp: Fix shost to rport translation

Benjamin Tissoires (2):
      Input: synaptics - add Lenovo 80 series ids to SMBus
      Input: elan_i2c_smbus - fix corrupted stack

Borislav Petkov (1):
      x86/MCE/AMD: Cache SMCA MISC block addresses

Brian Foster (1):
      xfs: detect agfl count corruption and reset agfl

Chris Wilson (2):
      drm/i915: Always sanity check engine state upon idling
      drm/i915/lvds: Move acpi lid notification registration to registration phase

Christophe Leroy (4):
      powerpc/mm/slice: Remove intermediate bitmap copy
      powerpc/mm/slice: create header files dedicated to slices
      powerpc/mm/slice: Enhance for supporting PPC32
      powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx

Colin Ian King (3):
      dma-buf: remove redundant initialization of sg_table
      ASoC: Intel: sst: remove redundant variable dma_dev_name
      platform/chrome: cros_ec_lpc: remove redundant pointer request

Dave Chinner (1):
      xfs: convert XFS_AGFL_SIZE to a helper function

Dexuan Cui (1):
      PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()

Dhinakaran Pandiyan (1):
      drm/psr: Fix missed entry in PSR setup time table.

Dmitry Torokhov (1):
      Input: synaptics - Lenovo Carbon X1 Gen5 (2017) devices should use RMI

Edvard Holst (1):
      Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints should use RMI

Eric Biggers (1):
      cfg80211: further limit wiphy names to 64 bytes

Eric Dumazet (1):
      tcp: avoid integer overflows in tcp_rcv_space_adjust()

Eugen Hristev (1):
      iio: adc: select buffer for at91-sama5d2_adc

Greg Kroah-Hartman (3):
      Revert "pinctrl: msm: Use dynamic GPIO numbering"
      hwtracing: stm: fix build error on some arches
      Linux 4.14.48

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

Hugh Dickins (2):
      mm: fix the NULL mapping case in __isolate_lru_page()
      mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty()

Josh Poimboeuf (5):
      objtool: Support GCC 8's cold subfunctions
      objtool: Support GCC 8 switch tables
      objtool: Detect RIP-relative switch table references
      objtool: Detect RIP-relative switch table references, part 2
      objtool: Fix "noreturn" detection for recursive sibling calls

Maciej W. Rozycki (2):
      MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs
      MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests

Martin Kelly (2):
      iio:buffer: make length types match kfifo types
      iio:kfifo_buf: check for uint overflow

Mathias Kresin (1):
      MIPS: lantiq: gphy: Drop reboot/remove reset asserts

Matthias Kaehlcke (2):
      drm/amd/powerplay: Fix enum mismatch
      rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c

Michael Nosthoff (1):
      iio: ad7793: implement IIO_CHAN_INFO_SAMP_FREQ

Nick Desaulniers (1):
      kbuild: clang: remove crufty HOSTCFLAGS

Ondrej Zary (1):
      drm/i915: Disable LVDS on Radiant P845

Parav Pandit (1):
      IB/core: Fix error code for invalid GID entry

Sachin Grover (1):
      selinux: KASAN: slab-out-of-bounds in xattr_getsecurity

Sodagudi Prasad (1):
      kbuild: clang: disable unused variable warnings only when constant

Stanislaw Gruszka (1):
      Revert "rt2800: use TXOP_BACKOFF for probe frames"

Steven Rostedt (VMware) (2):
      tracing: Fix crash when freeing instances with event triggers
      tracing: Make the snapshot trigger work with instances

Yazen Ghannam (1):
      x86/mce/AMD: Carve out SMCA get_block_address() code

 Makefile                                         |   2 +-
 arch/mips/kernel/process.c                       |   4 +
 arch/mips/kernel/ptrace.c                        |   2 +-
 arch/mips/kernel/ptrace32.c                      |   2 +-
 arch/powerpc/include/asm/book3s/64/slice.h       |  27 ++++
 arch/powerpc/include/asm/mmu-8xx.h               |   6 +
 arch/powerpc/include/asm/nohash/32/slice.h       |  18 +++
 arch/powerpc/include/asm/nohash/64/slice.h       |  12 ++
 arch/powerpc/include/asm/page.h                  |   1 +
 arch/powerpc/include/asm/page_64.h               |  59 --------
 arch/powerpc/include/asm/slice.h                 |  42 ++++++
 arch/powerpc/kernel/setup-common.c               |   2 +
 arch/powerpc/mm/8xx_mmu.c                        |   2 +-
 arch/powerpc/mm/hugetlbpage.c                    |   2 +
 arch/powerpc/mm/mmu_context_nohash.c             |  18 ++-
 arch/powerpc/mm/slice.c                          |  49 ++++---
 arch/powerpc/platforms/Kconfig.cputype           |   1 +
 arch/x86/kernel/cpu/mcheck/mce_amd.c             |  72 +++++-----
 drivers/gpu/drm/drm_dp_helper.c                  |   1 +
 drivers/gpu/drm/i915/intel_lvds.c                |  51 +++++--
 drivers/hwtracing/intel_th/msu.c                 |   6 +-
 drivers/hwtracing/stm/core.c                     |   7 +-
 drivers/iio/adc/Kconfig                          |   1 +
 drivers/iio/adc/ad7793.c                         |  75 ++++------
 drivers/iio/buffer/industrialio-buffer-dma.c     |   2 +-
 drivers/iio/buffer/kfifo_buf.c                   |  11 +-
 drivers/infiniband/core/cache.c                  |   2 +-
 drivers/input/mouse/elan_i2c_smbus.c             |  22 +--
 drivers/input/mouse/synaptics.c                  |   6 +
 drivers/net/wireless/ralink/rt2x00/rt2x00queue.c |   7 +-
 drivers/pci/host/pci-hyperv.c                    |  58 +++++++-
 drivers/pinctrl/qcom/pinctrl-msm.c               |   2 +-
 drivers/scsi/scsi_transport_srp.c                |  22 ++-
 drivers/soc/lantiq/gphy.c                        |  36 -----
 fs/aio.c                                         |   3 +-
 fs/xfs/libxfs/xfs_alloc.c                        | 125 ++++++++++++++++-
 fs/xfs/libxfs/xfs_alloc.h                        |   2 +
 fs/xfs/libxfs/xfs_format.h                       |  13 +-
 fs/xfs/xfs_fsops.c                               |   2 +-
 fs/xfs/xfs_mount.h                               |   1 +
 fs/xfs/xfs_trace.h                               |   9 +-
 include/linux/iio/buffer_impl.h                  |   6 +-
 include/linux/tcp.h                              |   2 +-
 include/uapi/linux/nl80211.h                     |   2 +-
 kernel/trace/trace.c                             |  12 +-
 kernel/trace/trace.h                             |  11 ++
 kernel/trace/trace_events_trigger.c              |  15 +-
 mm/huge_memory.c                                 |   2 +-
 mm/vmscan.c                                      |   2 +-
 net/ipv4/tcp_input.c                             |  10 +-
 security/selinux/ss/services.c                   |   2 +-
 tools/objtool/check.c                            | 167 +++++++++++++----------
 tools/objtool/elf.c                              |  42 +++++-
 tools/objtool/elf.h                              |   2 +
 54 files changed, 699 insertions(+), 361 deletions(-)
 create mode 100644 arch/powerpc/include/asm/book3s/64/slice.h
 create mode 100644 arch/powerpc/include/asm/nohash/32/slice.h
 create mode 100644 arch/powerpc/include/asm/nohash/64/slice.h
 create mode 100644 arch/powerpc/include/asm/slice.h

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

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