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

commit d88a5f7a84773dedda880aa6a8164a6d5925a97d
Author: Guenter Roeck <groeck@chromium.org>
Date: Mon Jul 30 16:22:42 2018

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

Merge of v4.14.59 into chromeos-4.14

Conflicts:
    net/ipv4/tcp_input.c

Changelog:
----------------------------------------------------------------
Alexey Kardashevskiy (1):
      KVM: PPC: Check if IOMMU page is contained in the pinned physical page

Anssi Hannula (7):
      can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK
      can: xilinx_can: fix power management handling
      can: xilinx_can: fix recovery from error states not being propagated
      can: xilinx_can: fix device dropping off bus on RX overrun
      can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting
      can: xilinx_can: fix incorrect clear of non-processed interrupts
      can: xilinx_can: fix RX overflow interrupt not being enabled

Antti Seppälä (1):
      usb: dwc2: Fix DMA alignment to start at allocated boundary

Ariel Levkovich (1):
      net/mlx5: Adjust clock overflow work period

Arnd Bergmann (1):
      turn off -Wattribute-alias

Bin Liu (1):
      usb: core: handle hub C_PORT_OVER_CURRENT condition

Boris Ostrovsky (1):
      xen/PVH: Set up GS segment for stack canary

Daniel Borkmann (1):
      sock: fix sg page frag coalescing in sk_alloc_sg

David Ahern (1):
      net/ipv6: Fix linklocal to global address with VRF

Eran Ben Elisha (2):
      net/mlx5e: Don't allow aRFS for encapsulated packets
      net/mlx5e: Fix quota counting in aRFS expire flow

Eric Dumazet (6):
      net: skb_segment() should not return NULL
      tcp: free batches of packets in tcp_prune_ofo_queue()
      tcp: avoid collapses in tcp_prune_queue() if possible
      tcp: detect malicious patterns in tcp_collapse_ofo_queue()
      tcp: call tcp_drop() from tcp_data_queue_ofo()
      tcp: add tcp_ooo_try_coalesce() helper

Felix Fietkau (1):
      MIPS: ath79: fix register address in ath79_ddr_wb_flush()

Greg Kroah-Hartman (2):
      Revert "cifs: Fix slab-out-of-bounds in send_set_info() on SMB2 ACE setting"
      Linux 4.14.59

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

Hangbin Liu (1):
      multicast: do not restore deleted record source filter mode to new one

Heiner Kallweit (1):
      net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv

Jack Morgenstein (1):
      net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper

Jarod Wilson (1):
      bonding: set default miimon value for non-arp modes if not set

Jerry Zhang (1):
      usb: gadget: f_fs: Only return delayed status when len is 0

Lubomir Rintel (1):
      usb: cdc_acm: Add quirk for Castles VEGA3000

Lyude Paul (2):
      drm/nouveau/drm/nouveau: Fix runtime PM leak in nv50_disp_atomic_commit()
      drm/nouveau: Set DRIVER_ATOMIC cap earlier to fix debugfs

Paolo Abeni (1):
      ip: hash fragments consistently

Paul Burton (1):
      MIPS: Fix off-by-one in pci_resource_to_user()

Rafael J. Wysocki (1):
      driver core: Partially revert "driver core: correct device's shutdown order"

Roman Fietze (1):
      can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can.ctrlmode

Roopa Prabhu (4):
      rtnetlink: add rtnl_link_state check in rtnl_configure_link
      vxlan: add new fdb alloc and create helpers
      vxlan: make netlink notify in vxlan_fdb_destroy optional
      vxlan: fix default fdb entry netlink notify ordering during netdev create

Samuel Thibault (1):
      staging: speakup: fix wraparound in uaccess length check

Stephane Grosjean (1):
      can: peak_canfd: fix firmware < v3.3.0: limit allocation to 32-bit DMA addr only

Willem de Bruijn (1):
      ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull

Yuchung Cheng (4):
      tcp: fix dctcp delayed ACK schedule
      tcp: helpers to send special DCTCP ack
      tcp: do not cancel delay-AcK on DCTCP special ACK
      tcp: do not delay ACK in DCTCP upon CE status change

 Makefile                                           |   3 +-
 arch/mips/ath79/common.c                           |   2 +-
 arch/mips/pci/pci.c                                |   2 +-
 arch/powerpc/include/asm/mmu_context.h             |   4 +-
 arch/powerpc/kvm/book3s_64_vio.c                   |   2 +-
 arch/powerpc/kvm/book3s_64_vio_hv.c                |   6 +-
 arch/powerpc/mm/mmu_context_iommu.c                |  37 +-
 arch/x86/xen/xen-pvh.S                             |  26 +-
 drivers/base/dd.c                                  |   8 -
 drivers/gpu/drm/nouveau/dispnv04/disp.c            |   3 +
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   7 +
 drivers/gpu/drm/nouveau/nv50_display.c             |   8 +-
 drivers/net/bonding/bond_options.c                 |  23 +-
 drivers/net/can/m_can/m_can.c                      |   3 +-
 drivers/net/can/peak_canfd/peak_pciefd_main.c      |  19 +
 drivers/net/can/xilinx_can.c                       | 392 +++++++++++++++------
 .../net/ethernet/mellanox/mlx4/resource_tracker.c  |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c  |   7 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_clock.c |  12 +-
 drivers/net/phy/phy.c                              |   2 +-
 drivers/net/vxlan.c                                | 126 +++++--
 drivers/staging/speakup/speakup_soft.c             |   6 +-
 drivers/usb/class/cdc-acm.c                        |   3 +
 drivers/usb/core/hub.c                             |   8 +-
 drivers/usb/dwc2/hcd.c                             |  44 +--
 drivers/usb/gadget/function/f_fs.c                 |   2 +-
 drivers/vfio/vfio_iommu_spapr_tce.c                |   2 +-
 fs/cifs/smb2pdu.c                                  |   7 +-
 include/linux/skbuff.h                             |   2 +
 include/net/tcp.h                                  |   7 +
 net/core/rtnetlink.c                               |   9 +-
 net/core/skbuff.c                                  |  10 +-
 net/ipv4/igmp.c                                    |   3 +-
 net/ipv4/ip_output.c                               |   2 +
 net/ipv4/ip_sockglue.c                             |   7 +-
 net/ipv4/tcp_dctcp.c                               |  50 +--
 net/ipv4/tcp_input.c                               |   5 +-
 net/ipv4/tcp_output.c                              |  33 +-
 net/ipv6/datagram.c                                |   7 +-
 net/ipv6/icmp.c                                    |   5 +-
 net/ipv6/ip6_output.c                              |   2 +
 net/ipv6/mcast.c                                   |   3 +-
 net/ipv6/tcp_ipv6.c                                |   6 +-
 net/tls/tls_sw.c                                   |   7 +-
 44 files changed, 641 insertions(+), 283 deletions(-)

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

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

[modify] https://crrev.com/d88a5f7a84773dedda880aa6a8164a6d5925a97d/net/ipv4/tcp_input.c