New issue
Advanced search Search tips

Issue 894803 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Oct 16
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.161 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Oct 12

Issue description

Merge v4.4.161 into chromeos-4.4
 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Oct 16

Labels: merge-merged-chromeos-4.4
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8b6e6c713d6f91fae430562488886fe67d9f178d

commit 8b6e6c713d6f91fae430562488886fe67d9f178d
Author: Guenter Roeck <groeck@chromium.org>
Date: Sat Oct 13 09:17:40 2018

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

Merge of v4.4.161 into chromeos-4.4

Conflicts:
    drivers/base/power/main.c

Changelog:
----------------------------------------------------------------
Andy Lutomirski (2):
      x86/vdso: Fix asm constraints on vDSO syscall fallbacks
      x86/vdso: Fix vDSO syscall fallback asm constraint regression

Carl Huang (1):
      ath10k: fix use-after-free in ath10k_wmi_cmd_send_nowait

Cong Wang (1):
      ucma: fix a use-after-free in ucma_resolve_ip()

Daniel Drake (1):
      PCI: Reprogram bridge prefetch registers on resume

Eric Dumazet (5):
      tcp: increment sk_drops for dropped rx packets
      tcp: fix a stale ooo_last_skb after a replace
      tcp: free batches of packets in tcp_prune_ofo_queue()
      tcp: call tcp_drop() from tcp_data_queue_ofo()
      tcp: add tcp_ooo_try_coalesce() helper

Felix Fietkau (1):
      mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys

Gao Feng (1):
      ebtables: arpreply: Add the standard target sanity check

Greg Kroah-Hartman (1):
      Linux 4.4.161

Guenter Roeck (2):
      of: unittest: Disable interrupt node tests for old world MAC systems
      Merge remote-tracking branch 'origin/linux/v4.4.161' into merge/chromeos-4.4-v4.4.161

Jann Horn (1):
      mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly

Johan Hovold (1):
      USB: serial: simple: add Motorola Tetra MTP6550 id

Mathias Nyman (1):
      xhci: Add missing CAS workaround for Intel Sunrise Point xHCI

Michal Suchanek (1):
      powerpc/fadump: Return error when fadump registration fails

Mike Snitzer (1):
      dm cache: fix resize crash if user doesn't reload cache table

Prateek Sood (1):
      cgroup: Fix deadlock in cpu hotplug path

Rafael J. Wysocki (1):
      PM / core: Clear the direct_complete flag on errors

Richard Weinberger (1):
      ubifs: Check for name being NULL while mounting

Theodore Ts'o (1):
      ext4: always verify the magic number in xattr blocks

Tomi Valkeinen (1):
      fbdev/omapfb: fix omapfb_memory_read infoleak

Vineet Gupta (1):
      ARC: clone syscall to setp r25 as thread pointer

Yaogong Wang (1):
      tcp: use an RB tree for ooo receive queue

Zhi Chen (1):
      ath10k: fix scan crash due to incorrect length calculation

 Makefile                                        |   2 +-
 arch/arc/kernel/process.c                       |  20 ++
 arch/powerpc/kernel/fadump.c                    |  23 +-
 arch/x86/entry/vdso/vclock_gettime.c            |  26 +-
 drivers/base/power/main.c                       |   5 +-
 drivers/infiniband/core/ucma.c                  |   2 +
 drivers/md/dm-cache-target.c                    |   9 +-
 drivers/net/wireless/ath/ath10k/trace.h         |  12 +-
 drivers/net/wireless/ath/ath10k/wmi-tlv.c       |   8 +-
 drivers/net/wireless/ath/ath10k/wmi.c           |   2 +-
 drivers/of/unittest.c                           |  28 +-
 drivers/pci/pci.c                               |  27 +-
 drivers/usb/host/xhci-pci.c                     |   2 +
 drivers/usb/serial/usb-serial-simple.c          |   3 +-
 drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c |   5 +-
 fs/ext4/xattr.c                                 |   6 +-
 fs/ubifs/super.c                                |   3 +
 include/linux/netfilter_bridge/ebtables.h       |   5 +
 include/linux/skbuff.h                          |   8 +
 include/linux/tcp.h                             |   7 +-
 include/net/sock.h                              |   7 +
 include/net/tcp.h                               |   2 +-
 kernel/cgroup.c                                 |   6 +-
 mm/vmstat.c                                     |   3 +
 net/bridge/netfilter/ebt_arpreply.c             |   3 +
 net/core/skbuff.c                               |  19 ++
 net/ipv4/tcp.c                                  |   4 +-
 net/ipv4/tcp_input.c                            | 417 +++++++++++++++---------
 net/ipv4/tcp_ipv4.c                             |   3 +-
 net/ipv4/tcp_minisocks.c                        |   1 -
 net/ipv6/tcp_ipv6.c                             |   1 +
 net/mac80211/cfg.c                              |   2 +-
 32 files changed, 438 insertions(+), 233 deletions(-)

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

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

[modify] https://crrev.com/8b6e6c713d6f91fae430562488886fe67d9f178d/drivers/base/power/main.c

Status: Fixed (was: Started)

Sign in to add a comment