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

commit f5546585f184dc42829102e60a02848373b27445
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Jun 13 20:40:30 2018

CHROMIUM: Merge 'v4.4.137' into chromeos-4.4

Merge of v4.4.137 into chromeos-4.4

Conflicts:
    drivers/char/tpm/tpm.h
    drivers/char/tpm/tpm-chip.c

Changelog:
----------------------------------------------------------------
Alexey Kodanev (1):
      dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()

Amir Goldstein (1):
      xfs: fix incorrect log_flushed on fsync

Chris Chiu (1):
      tpm: self test failure should not cause suspend to fail

Cong Wang (1):
      netdev-FAQ: clarify DaveM's position for stable backports

Dan Carpenter (1):
      team: use netdev_features_t instead of u32

Daniele Palmas (1):
      net: usb: cdc_mbim: add flag FLAG_SEND_ZLP

Dave Airlie (1):
      drm: set FMODE_UNSIGNED_OFFSET for drm files

Enric Balletbo i Serra (1):
      tpm: do not suspend/resume if power stays on

Eric Dumazet (3):
      net/packet: refine check for priv area size
      rtnetlink: validate attributes in do_setlink()
      net: metrics: add proper netlink validation

Florian Fainelli (1):
      net: phy: broadcom: Fix bcm_write_exp()

Govindarajulu Varadarajan (1):
      enic: set DMA mask to 47 bit

Greg Kroah-Hartman (1):
      Linux 4.4.137

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

Jack Morgenstein (1):
      net/mlx4: Fix irq-unsafe spinlock usage

Julia Lawall (1):
      bnx2x: use the right constant

Linus Torvalds (2):
      mmap: introduce sane default mmap limits
      mmap: relax file size limit for regular files

Nathan Chancellor (1):
      kconfig: Avoid format overflow warning from GCC 8.1

Sabrina Dubroca (1):
      ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds

Shahed Shaikh (1):
      qed: Fix mask for physical address in ILT entry

Stefan Wahren (1):
      brcmfmac: Fix check for ISO3166 code

Wenwen Wang (1):
      isdn: eicon: fix a missing-check bug

Willem de Bruijn (2):
      ipv4: remove warning in ip_recv_error
      packet: fix reserve calculation

 Documentation/networking/netdev-FAQ.txt          |  9 +++++++
 Makefile                                         |  2 +-
 drivers/char/tpm/tpm-chip.c                      | 13 ++++++++++
 drivers/char/tpm/tpm-interface.c                 |  7 ++++++
 drivers/char/tpm/tpm.h                           |  1 +
 drivers/gpu/drm/drm_fops.c                       |  1 +
 drivers/isdn/hardware/eicon/diva.c               | 22 ++++++++++------
 drivers/isdn/hardware/eicon/diva.h               |  5 ++--
 drivers/isdn/hardware/eicon/divasmain.c          | 18 +++++++------
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c |  2 +-
 drivers/net/ethernet/cisco/enic/enic_main.c      |  8 +++---
 drivers/net/ethernet/mellanox/mlx4/qp.c          |  4 +--
 drivers/net/ethernet/qlogic/qed/qed_cxt.c        |  2 +-
 drivers/net/phy/bcm-cygnus.c                     |  6 ++---
 drivers/net/phy/bcm-phy-lib.h                    |  7 ++++++
 drivers/net/phy/bcm7xxx.c                        |  4 +--
 drivers/net/team/team.c                          |  3 ++-
 drivers/net/usb/cdc_mbim.c                       |  2 +-
 fs/xfs/xfs_log.c                                 |  7 ------
 mm/mmap.c                                        | 32 ++++++++++++++++++++++++
 net/core/rtnetlink.c                             |  8 +++---
 net/dccp/proto.c                                 |  2 --
 net/ipv4/fib_semantics.c                         |  2 ++
 net/ipv4/ip_sockglue.c                           |  2 --
 net/ipv6/ip6mr.c                                 |  3 ++-
 net/packet/af_packet.c                           |  4 +--
 scripts/kconfig/confdata.c                       |  2 +-
 27 files changed, 127 insertions(+), 51 deletions(-)

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

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

[modify] https://crrev.com/f5546585f184dc42829102e60a02848373b27445/drivers/char/tpm/tpm.h
[modify] https://crrev.com/f5546585f184dc42829102e60a02848373b27445/drivers/char/tpm/tpm-chip.c
[delete] https://crrev.com/73a8a5dc49a5764810319e7d5d8bfb265e2de59f/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c