Issue 842133  has been merged into this issue.

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

commit dce43deade9a6584ea9f463dc2f92ae4cc6f4d7f
Author: Guenter Roeck <groeck@chromium.org>
Date: Fri May 18 14:58:19 2018

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

Merge of v4.4.132 into chromeos-4.4

Conflicts:
    drivers/input/touchscreen/atmel_mxt_ts.c

Changes applied on top of 'v4.4.132' prior to merge:
    f33a82ca0d83 CHROMIUM: Revert "xfrm_user: fix return value from xfrm_user_rcv_msg"

Changelog:
----------------------------------------------------------------
Alan Stern (1):
      USB: Accept bulk endpoints with 1024-byte maxpacket

Alexander Yarygin (1):
      KVM: s390: Enable all facility bits that are known good for passthrough

Ben Hutchings (1):
      test_firmware: fix setting old custom fw path back on exit, second try

Bin Liu (1):
      usb: musb: host: fix potential NULL pointer dereference

Danit Goldberg (1):
      IB/mlx5: Use unlimited rate when static rate is not supported

Darrick J. Wong (1):
      xfs: prevent creating negative-sized file via INSERT_RANGE

David Spinadel (1):
      mac80211: Add RX flag to indicate ICV stripped

Dmitry Torokhov (1):
      Input: leds - fix out of bound access

Eric Dumazet (8):
      crypto: af_alg - fix possible uninit-value in alg_bind()
      netlink: fix uninit-value in netlink_sendmsg
      net: fix rtnh_ok()
      net: initialize skb->peeked when cloning
      net: fix uninit-value in __hw_addr_add_ex()
      dccp: initialize ireq->ir_mark
      soreuseport: initialise timewait reuseport field
      tcp: fix TCP_REPAIR_QUEUE bound checking

Greg Kroah-Hartman (2):
      USB: serial: visor: handle potential invalid device configuration
      Linux 4.4.132

Guenter Roeck (2):
      CHROMIUM: Revert "xfrm_user: fix return value from xfrm_user_rcv_msg"
      Merge remote-tracking branch 'origin/linux/v4.4.132' into merge/chromeos-4.4-v4.4.132

Gustavo A. R. Silva (2):
      net: atm: Fix potential Spectre v1
      atm: zatm: Fix potential Spectre v1

Hans de Goede (2):
      libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs
      Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"

Jan Kara (1):
      bdi: Fix oops in wb_workfn()

Jimmy Assarsson (1):
      can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg()

Jiri Olsa (1):
      perf: Remove superfluous allocation error check

Johan Hovold (2):
      USB: serial: option: reimplement interface masking
      rfkill: gpio: fix memory leak in probe error path

Julian Anastasov (1):
      ipvs: fix rtnl_lock lockups caused by start_sync_thread

Kristian Evensen (1):
      USB: serial: option: Add support for Quectel EP06

Leon Romanovsky (1):
      RDMA/mlx5: Protect from shift operand overflow

Markus Pargmann (1):
      gpmi-nand: Handle ECC Errors in erased pages

Masami Hiramatsu (1):
      tracing/uprobe_event: Fix strncpy corner case

Mathieu Desnoyers (1):
      tracepoint: Do not warn on ENOMEM

Peter Zijlstra (5):
      perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_*
      perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr
      perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver
      perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]
      perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map()

Robert Rosengren (1):
      ALSA: aloop: Mark paused device as inactive

Roland Dreier (1):
      RDMA/ucma: Allow resolving address w/o specifying source address

SZ Lin (林上智) (2):
      NET: usb: qmi_wwan: add support for ublox R410M PID 0x90b2
      USB: serial: option: adding support for ublox R410M

Sara Sharon (2):
      mac80211: allow not sending MIC up from driver for HW crypto
      mac80211: allow same PN for AMSDU sub-frames

Steven Rostedt (VMware) (1):
      tracing: Fix regex_match_front() to not over compare the test string

Takashi Iwai (3):
      ALSA: pcm: Check PCM state at xfern compat ioctl
      ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger()
      ALSA: aloop: Add missing cable lock to ctl API callbacks

Tan Xiaojun (1):
      perf/core: Fix the perf_cpu_time_max_percent check

Tejun Heo (1):
      percpu: include linux/sched.h for cond_resched()

Teng Qin (1):
      bpf: map_get_next_key to return first key on NULL

Thomas Hellstrom (1):
      drm/vmwgfx: Fix a buffer object leak

Vasanthakumar Thiagarajan (2):
      ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode
      ath10k: rebuild crypto header in rx data frames

Vittorio Gambaletta (VittGam) (1):
      Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro

Wei Fang (1):
      f2fs: fix a dead loop in f2fs_fiemap()

Yi Zhao (1):
      xfrm_user: fix return value from xfrm_user_rcv_msg

 Makefile                                          |   2 +-
 arch/s390/kvm/kvm-s390.c                          |   4 +-
 arch/x86/kernel/cpu/perf_event.c                  |   8 +-
 arch/x86/kernel/cpu/perf_event_intel_cstate.c     |   2 +
 arch/x86/kernel/cpu/perf_event_msr.c              |   9 +-
 crypto/af_alg.c                                   |   8 +-
 drivers/ata/libata-core.c                         |   3 +
 drivers/atm/zatm.c                                |   3 +
 drivers/bluetooth/btusb.c                         |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c               |   1 +
 drivers/infiniband/core/ucma.c                    |   2 +-
 drivers/infiniband/hw/mlx5/qp.c                   |  22 +-
 drivers/input/input-leds.c                        |   8 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c            |  78 +++-
 drivers/net/can/usb/kvaser_usb.c                  |   2 +-
 drivers/net/usb/qmi_wwan.c                        |   1 +
 drivers/net/wireless/ath/ath10k/core.c            |   8 +
 drivers/net/wireless/ath/ath10k/core.h            |   4 +
 drivers/net/wireless/ath/ath10k/htt_rx.c          | 100 ++++-
 drivers/net/wireless/ath/wcn36xx/txrx.c           |   2 +-
 drivers/usb/core/config.c                         |   4 +-
 drivers/usb/musb/musb_host.c                      |   4 +-
 drivers/usb/serial/option.c                       | 448 ++++++++--------------
 drivers/usb/serial/visor.c                        |  69 ++--
 fs/f2fs/data.c                                    |   2 +-
 fs/fs-writeback.c                                 |   2 +-
 fs/xfs/xfs_file.c                                 |  14 +-
 include/net/inet_timewait_sock.h                  |   1 +
 include/net/mac80211.h                            |  14 +-
 include/net/nexthop.h                             |   2 +-
 kernel/bpf/arraymap.c                             |   2 +-
 kernel/bpf/hashtab.c                              |   9 +-
 kernel/bpf/syscall.c                              |  20 +-
 kernel/events/callchain.c                         |  10 +-
 kernel/events/ring_buffer.c                       |   7 +-
 kernel/trace/trace_events_filter.c                |   3 +
 kernel/trace/trace_uprobe.c                       |   2 +
 kernel/tracepoint.c                               |   4 +-
 mm/percpu.c                                       |   1 +
 net/atm/lec.c                                     |   9 +-
 net/core/dev_addr_lists.c                         |   4 +-
 net/core/skbuff.c                                 |   1 +
 net/dccp/ipv4.c                                   |   1 +
 net/dccp/ipv6.c                                   |   1 +
 net/ipv4/inet_timewait_sock.c                     |   1 +
 net/ipv4/tcp.c                                    |   2 +-
 net/mac80211/util.c                               |   5 +-
 net/mac80211/wep.c                                |   3 +-
 net/mac80211/wpa.c                                |  45 ++-
 net/netfilter/ipvs/ip_vs_ctl.c                    |   8 -
 net/netfilter/ipvs/ip_vs_sync.c                   | 155 ++++----
 net/netlink/af_netlink.c                          |   2 +
 net/rfkill/rfkill-gpio.c                          |   7 +-
 sound/core/pcm_compat.c                           |   2 +
 sound/core/seq/seq_virmidi.c                      |   4 +-
 sound/drivers/aloop.c                             |  29 +-
 tools/testing/selftests/firmware/fw_filesystem.sh |   6 +-
 57 files changed, 644 insertions(+), 528 deletions(-)

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

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

[modify] https://crrev.com/dce43deade9a6584ea9f463dc2f92ae4cc6f4d7f/drivers/input/touchscreen/atmel_mxt_ts.c