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

commit 87c1fe73fd00744cc721ce3fc71113d64d549776
Author: Guenter Roeck <groeck@chromium.org>
Date: Sun Dec 02 17:41:31 2018

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

Merge of v4.14.85 into chromeos-4.14

Conflicts:
    mm/z3fold.c
    fs/namei.c
    drivers/usb/host/xhci-hub.c

Changelog:
----------------------------------------------------------------
Aaron Ma (2):
      usb: xhci: fix timeout for transition from RExit to U0
      usb: xhci: fix uninitialized completion when USB3 port got wrong status

Alexander Aring (1):
      net: ieee802154: 6lowpan: fix frag reassembly

Alexandre Belloni (1):
      rtc: omap: fix error path when pinctrl_register fails

Alistair Strachan (1):
      efi/libstub: arm: support building with clang

Andrew Price (1):
      gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd

Andy Shevchenko (1):
      usb: dwc3: core: Clean up ULPI device

Aneesh Kumar K.V (1):
      mm/memory.c: recheck page table entry with page table lock held

Anson Huang (1):
      cpufreq: imx6q: add return value check for voltage scale

Ard Biesheuvel (2):
      crypto: simd - correctly take reqsize of wrapped skcipher into account
      efi/arm: Revert deferred unmap of early memmap mapping

Cherian, George (1):
      xhci: Add quirk to workaround the errata seen on Cavium Thunder-X2 Soc

Dennis Wassenberg (1):
      usb: core: Fix hub port connection events lost

Dmitry Kasatkin (1):
      ima: re-introduce own integrity cache lock

Dmitry Torokhov (1):
      Input: synaptics - avoid using uninitialized variable when probing

Dmitry Vyukov (1):
      mm: don't warn about large allocations for slab

Dominique Martinet (1):
      v9fs_dir_readdir: fix double-free on p9stat_read error

Emmanuel Grumbach (2):
      iwlwifi: mvm: support sta_statistics() even on older firmware
      iwlwifi: mvm: fix regulatory domain update when the firmware starts

Eran Ben Elisha (1):
      net/mlx4_core: Fix wrong calculation of free counters

Eric Dumazet (2):
      llc: do not use sk_eat_skb()
      tcp: do not release socket ownership in tcp_close()

Felipe Balbi (1):
      usb: dwc3: gadget: fix ISOC TRB type on unaligned transfers

Francis Therien (1):
      Input: xpad - add PDP device id 0x02a4

Greg Hackmann (1):
      arm64: remove no-op -p linker flag

Greg Kroah-Hartman (3):
      MAINTAINERS: Add Sasha as a stable branch maintainer
      tty: wipe buffer if not echoing data
      Linux 4.14.85

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

Janosch Frank (1):
      s390/mm: Check for valid vma before zapping in gmap_discard

Jeffy Chen (1):
      driver core: Move device_links_purge() after bus_remove_device()

Jens Axboe (1):
      floppy: fix race condition in __floppy_read_block_0()

Jerome Brunet (1):
      pinctrl: meson: fix pinconf bias disable

Johan Hovold (6):
      of: add helper to lookup compatible child node
      NFC: nfcmrvl_uart: fix OF child-node lookup
      net: bcmgenet: fix OF child-node lookup
      drm/mediatek: fix OF sibling-node lookup
      power: supply: twl4030-charger: fix OF sibling-node lookup
      mtd: rawnand: atmel: fix OF child-node lookup

Kan Liang (1):
      perf/x86/intel/uncore: Add more IMC PCI IDs for KabyLake and CoffeeLake CPUs

Konstantin Khlebnikov (1):
      tools/power/cpupower: fix compilation with STATIC=true

Krzysztof Kozlowski (1):
      ARM: dts: exynos: Fix invalid node referenced by i2c20 alias in Peach Pit and Pi

Leo Sperling (1):
      Input: xpad - fix some coding style issues

Linus Torvalds (1):
      tty: wipe buffer.

Luca Coelho (1):
      iwlwifi: mvm: don't use SAR Geo if basic SAR is not used

Lukas Wunner (1):
      can: hi311x: Use level-triggered interrupt

Marc Kleine-Budde (4):
      can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb()
      can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length
      can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed out of bounds
      can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb

Marc Zyngier (1):
      xhci: Allow more than 32 quirks

Marcus Folkesson (1):
      Input: xpad - avoid using __set_bit() for capabilities

Marek Szyprowski (1):
      clk: samsung: exynos5250: Add missing clocks for FIMC LITE SYSMMU devices

Mathias Nyman (1):
      usb: xhci: Prevent bus suspend if a port connect change or polling state is detected

Matt Chen (1):
      iwlwifi: fix wrong WGDS_WIFI_DATA_SIZE

Matthew Garrett (1):
      EVM: Add support for portable signature format

Michael Ellerman (1):
      powerpc/io: Fix the IO workarounds code to work with Radix

Michael J. Ruhl (1):
      IB/hfi1: Eliminate races in the SDMA send error path

Michal Hocko (1):
      mm, page_alloc: check for max order in hot path

Mimi Zohar (2):
      ima: always measure and audit files in policy
      ima: re-initialize iint->atomic_flags

Mustafa Ismail (1):
      i40iw: Fix memory leak in error path of create QP

Niklas Cassel (1):
      PCI: endpoint: Populate func_no before calling pci_epc_add_epf()

Oleksij Rempel (2):
      can: rx-offload: introduce can_rx_offload_get_echo_skb() and can_rx_offload_queue_sorted() functions
      can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail()

Oliver Hartkopp (1):
      can: raw: check for CAN FD capable netdev in raw_sendmsg()

Parav Pandit (1):
      IB/core: Perform modify QP on real one

Paul E. McKenney (1):
      rcu: Make need_resched() respond to urgent RCU-QS needs

Phil Elwell (1):
      lan78xx: Read MAC address from DT if present

Prarit Bhargava (1):
      kdb: Use strscpy with destination buffer size

Rafał Miłecki (1):
      brcmfmac: fix reporting support for 160 MHz channels

Rajat Jain (1):
      mmc: sdhci-pci: Try "cd" for card-detect lookup before using NULL

Ramses Ramírez (1):
      Input: xpad - add support for Xbox1 PDP Camo series gamepad

Richard Weinberger (1):
      ubi: fastmap: Check each mapping only once

Salvatore Mesoraca (1):
      namei: allow restricted O_CREAT of FIFOs and regular files

Sandeep Singh (1):
      xhci: Add check for invalid byte size error when UAS devices are connected.

Satheesh Rajendran (1):
      powerpc/numa: Suppress "VPHN is not supported" messages

Scott Wood (1):
      KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE

Sebastien Boisvert (1):
      include/linux/pfn_t.h: force '~' to be parsed as an unary operator

Stefan Agner (5):
      ARM: 8766/1: drop no-thumb-interwork in EABI mode
      ARM: 8767/1: add support for building ARM kernel with clang
      bus: arm-cci: remove unnecessary unreachable()
      ARM: trusted_foundations: do not use naked function
      kbuild: allow to use GCC toolchain not in Clang search path

Takashi Iwai (1):
      ALSA: oss: Use kvzalloc() for local buffer allocations

Tetsuo Handa (2):
      selinux: Add __GFP_NOWARN to allocation at str_read()
      bfs: add sanity check at bfs_fill_super()

Thinh Nguyen (1):
      usb: dwc3: gadget: Properly check last unaligned/zero chain TRB

Thomas Zimmermann (1):
      drm/ast: Remove existing framebuffers before loading driver

Trond Myklebust (1):
      SUNRPC: Fix a bogus get/put in generic_key_to_expire()

Vitaly Wool (1):
      z3fold: fix possible reclaim races

Vladimir Zapolskiy (1):
      gpio: don't free unallocated ida on gpiochip_add_data_with_key() error path

Xin Long (1):
      sctp: clear the transport of some out_chunk_list chunks in sctp_assoc_rm_peer

Xulin Sun (1):
      rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write

Y.C. Chen (2):
      drm/ast: change resolution may cause screen blurred
      drm/ast: fixed cursor may disappear sometimes

Yufen Yu (1):
      tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset

 .../devicetree/bindings/net/can/holt_hi311x.txt    |   2 +-
 Documentation/sysctl/fs.txt                        |  36 +++++++
 MAINTAINERS                                        |   1 +
 Makefile                                           |  10 +-
 arch/arm/Makefile                                  |   2 +-
 arch/arm/boot/compressed/Makefile                  |   2 +-
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |   4 +-
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |   4 +-
 arch/arm/firmware/trusted_foundations.c            |  14 ++-
 arch/arm64/Makefile                                |   2 +-
 arch/powerpc/include/asm/io.h                      |  20 ++--
 arch/powerpc/kvm/trace.h                           |   8 +-
 arch/powerpc/kvm/trace_booke.h                     |   9 +-
 arch/powerpc/kvm/trace_hv.h                        |   9 +-
 arch/powerpc/kvm/trace_pr.h                        |   9 +-
 arch/powerpc/mm/numa.c                             |   2 +-
 arch/s390/mm/gmap.c                                |   2 +
 arch/x86/events/intel/uncore_snb.c                 | 115 ++++++++++++++++++++-
 crypto/simd.c                                      |   5 +-
 drivers/base/core.c                                |   2 +-
 drivers/block/floppy.c                             |   3 +-
 drivers/bus/arm-cci.c                              |   2 -
 drivers/clk/samsung/clk-exynos5250.c               |   6 ++
 drivers/cpufreq/imx6q-cpufreq.c                    |   7 +-
 drivers/firmware/efi/arm-init.c                    |   4 +
 drivers/firmware/efi/arm-runtime.c                 |   2 +-
 drivers/firmware/efi/libstub/Makefile              |   3 +-
 drivers/firmware/efi/memmap.c                      |   3 +
 drivers/gpio/gpiolib.c                             |   5 +-
 drivers/gpu/drm/ast/ast_drv.c                      |  21 ++++
 drivers/gpu/drm/ast/ast_mode.c                     |   3 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   5 +-
 drivers/infiniband/core/verbs.c                    |   5 +-
 drivers/infiniband/hw/hfi1/user_sdma.c             |  87 +++++++---------
 drivers/infiniband/hw/hfi1/user_sdma.h             |   3 -
 drivers/infiniband/hw/i40iw/i40iw_verbs.c          |   2 +-
 drivers/input/joystick/xpad.c                      |  45 +++++---
 drivers/input/mouse/synaptics.c                    |   4 +-
 drivers/mmc/host/sdhci-pci-core.c                  |   7 +-
 drivers/mtd/nand/atmel/nand-controller.c           |  11 +-
 drivers/mtd/ubi/build.c                            |   1 +
 drivers/mtd/ubi/eba.c                              |   4 +
 drivers/mtd/ubi/fastmap.c                          |  20 ++++
 drivers/mtd/ubi/ubi.h                              |  11 ++
 drivers/mtd/ubi/vmt.c                              |   1 +
 drivers/mtd/ubi/vtbl.c                             |  16 ++-
 drivers/net/can/dev.c                              |  48 ++++++---
 drivers/net/can/flexcan.c                          |   4 +-
 drivers/net/can/rx-offload.c                       |  51 ++++++++-
 drivers/net/can/spi/hi311x.c                       |   2 +-
 drivers/net/ethernet/broadcom/genet/bcmmii.c       |   2 +-
 .../net/ethernet/mellanox/mlx4/resource_tracker.c  |   1 -
 drivers/net/usb/lan78xx.c                          |  42 ++++----
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   3 +-
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c        |  40 +++++--
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |  12 +--
 drivers/net/wireless/intel/iwlwifi/mvm/nvm.c       |   5 +-
 drivers/nfc/nfcmrvl/uart.c                         |   5 +-
 drivers/of/base.c                                  |  25 +++++
 drivers/pci/endpoint/pci-ep-cfs.c                  |  14 ++-
 drivers/pinctrl/meson/pinctrl-meson.c              |   2 +-
 drivers/power/supply/twl4030_charger.c             |   5 +-
 drivers/rtc/rtc-omap.c                             |   3 +-
 drivers/rtc/rtc-pcf2127.c                          |   3 +
 drivers/tty/n_tty.c                                |  20 +++-
 drivers/tty/tty_buffer.c                           |   6 +-
 drivers/usb/dwc3/core.c                            |   1 +
 drivers/usb/dwc3/gadget.c                          |   8 +-
 drivers/usb/host/xhci-hub.c                        |   7 +-
 drivers/usb/host/xhci-pci.c                        |   5 +
 drivers/usb/host/xhci-ring.c                       |  38 ++++++-
 drivers/usb/host/xhci.c                            |   6 +-
 drivers/usb/host/xhci.h                            |  67 ++++++------
 fs/9p/vfs_dir.c                                    |  11 --
 fs/bfs/inode.c                                     |   9 +-
 fs/gfs2/ops_fstype.c                               |   2 +-
 fs/namei.c                                         |  53 +++++++++-
 include/linux/can/dev.h                            |   1 +
 include/linux/can/rx-offload.h                     |   7 +-
 include/linux/fs.h                                 |   2 +
 include/linux/of.h                                 |   8 ++
 include/linux/pfn_t.h                              |   2 +-
 include/net/sock.h                                 |   1 +
 kernel/debug/kdb/kdb_io.c                          |  15 +--
 kernel/debug/kdb/kdb_private.h                     |   2 +-
 kernel/debug/kdb/kdb_support.c                     |  10 +-
 kernel/rcu/tree.c                                  |   9 ++
 kernel/sysctl.c                                    |  18 ++++
 mm/memory.c                                        |  34 +++++-
 mm/page_alloc.c                                    |  20 ++--
 mm/shmem.c                                         |   4 +-
 mm/slab.c                                          |   4 +
 mm/slab_common.c                                   |  12 +--
 mm/z3fold.c                                        |  99 +++++++++++-------
 net/can/raw.c                                      |  15 +--
 net/core/sock.c                                    |   2 +-
 net/ieee802154/6lowpan/6lowpan_i.h                 |   4 +-
 net/ieee802154/6lowpan/reassembly.c                |  14 +--
 net/ipv4/tcp.c                                     |  11 +-
 net/llc/af_llc.c                                   |  11 +-
 net/sctp/associola.c                               |  10 +-
 net/sunrpc/auth_generic.c                          |   8 +-
 security/selinux/ss/policydb.c                     |   2 +-
 sound/core/oss/pcm_oss.c                           |   6 +-
 sound/core/oss/pcm_plugin.c                        |   6 +-
 tools/power/cpupower/bench/Makefile                |   2 +-
 tools/power/cpupower/lib/cpufreq.c                 |   2 +-
 tools/power/cpupower/lib/cpuidle.c                 |   2 +-
 tools/power/cpupower/lib/cpupower.c                |   4 +-
 tools/power/cpupower/lib/cpupower_intern.h         |   2 +-
 110 files changed, 977 insertions(+), 411 deletions(-)

BUG= chromium:910939 
TEST=Build and test on various affected systems
Signed-off-by: Guenter Roeck <groeck@chromium.org>

Change-Id: I1c1c6d43f55ba9a62ad1da33a3f86815c1863e05

[modify] https://crrev.com/87c1fe73fd00744cc721ce3fc71113d64d549776/drivers/usb/host/xhci-hub.c
[modify] https://crrev.com/87c1fe73fd00744cc721ce3fc71113d64d549776/mm/z3fold.c
[modify] https://crrev.com/87c1fe73fd00744cc721ce3fc71113d64d549776/fs/namei.c