Issue 875686  has been merged into this issue.

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

commit 944ef373dfadf3aa037de7402851450264dc6e21
Author: Guenter Roeck <groeck@chromium.org>
Date: Thu Aug 23 19:47:55 2018

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

Merge of v4.4.151 into chromeos-4.4

Conflicts:
    include/net/af_vsock.h

Changelog:
----------------------------------------------------------------
Aleksander Morgado (1):
      USB: option: add support for DW5821e

Alexey Kodanev (1):
      dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()

Chen Hu (1):
      serial: 8250_dw: always set baud rate in dw8250_set_termios

Cong Wang (2):
      llc: use refcount_inc_not_zero() for llc_sap_find()
      vsock: split dwork to avoid reinitializations

Greg Kroah-Hartman (2):
      Linux 4.4.150
      Linux 4.4.151

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

Hangbin Liu (2):
      net_sched: Fix missing res info when create new tc_index filter
      net_sched: fix NULL pointer dereference when delete tcindex filter

Hans de Goede (1):
      ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry

John Ogness (1):
      USB: serial: sierra: fix potential deadlock at close

Kees Cook (1):
      isdn: Disable IIOCDBGVAR

Park Ju Hyung (2):
      ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs
      ALSA: hda - Turn CX8200 into D3 as well upon reboot

Sean Christopherson (1):
      x86/speculation/l1tf: Exempt zeroed PTEs from inversion

Sudip Mukherjee (1):
      Bluetooth: avoid killing an already killed socket

Takashi Iwai (5):
      ALSA: vx222: Fix invalid endian conversions
      ALSA: virmidi: Fix too long output trigger loop
      ALSA: cs5535audio: Fix invalid endian conversion
      ALSA: memalloc: Don't exceed over the requested size
      ALSA: vxpocket: Fix invalid endian conversions

Tom Lendacky (1):
      x86/mm: Simplify p[g4um]d_page() macros

Wei Wang (1):
      l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache

Willy Tarreau (1):
      ACPI / PM: save NVS memory for ASUS 1025C laptop

Zhang Rui (1):
      ACPI: save NVS memory for Lenovo G50-45

 Makefile                                |  2 +-
 arch/x86/include/asm/pgtable-invert.h   | 11 ++++++++++-
 arch/x86/include/asm/pgtable.h          | 13 ++++++++-----
 drivers/acpi/sleep.c                    | 27 +++++++++++++++++++++++++++
 drivers/isdn/i4l/isdn_common.c          |  8 +-------
 drivers/tty/serial/8250/8250_dw.c       |  2 +-
 drivers/usb/serial/option.c             |  4 ++++
 drivers/usb/serial/sierra.c             |  4 ++--
 include/net/af_vsock.h                  |  4 ++--
 include/net/llc.h                       |  5 +++++
 net/bluetooth/sco.c                     |  3 ++-
 net/dccp/ccids/ccid2.c                  |  6 ++++--
 net/l2tp/l2tp_core.c                    |  2 +-
 net/llc/llc_core.c                      |  4 ++--
 net/sched/cls_tcindex.c                 |  8 +++-----
 net/vmw_vsock/af_vsock.c                | 15 ++++++++-------
 net/vmw_vsock/vmci_transport.c          |  3 +--
 sound/core/memalloc.c                   |  8 ++------
 sound/core/seq/seq_virmidi.c            | 10 ++++++++++
 sound/pci/cs5535audio/cs5535audio.h     |  6 +++---
 sound/pci/cs5535audio/cs5535audio_pcm.c |  4 ++--
 sound/pci/hda/hda_intel.c               |  2 +-
 sound/pci/hda/patch_conexant.c          |  4 +++-
 sound/pci/vx222/vx222_ops.c             |  8 ++++----
 sound/pcmcia/vx/vxp_ops.c               | 10 +++++-----
 25 files changed, 112 insertions(+), 61 deletions(-)

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

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

[modify] https://crrev.com/944ef373dfadf3aa037de7402851450264dc6e21/include/net/af_vsock.h