New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 894804 link

Starred by 2 users

Issue metadata

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



Sign in to add a comment

Merge v4.14.76 into chromeos-4.14

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

Issue description

Merge v4.14.76 into chromeos-4.14

 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Oct 16

Labels: merge-merged-chromeos-4.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/605c1329d4e448307be1513406c7ba163e4dd3c3

commit 605c1329d4e448307be1513406c7ba163e4dd3c3
Author: Guenter Roeck <groeck@chromium.org>
Date: Sat Oct 13 09:07:32 2018

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

Merge of v4.14.76 into chromeos-4.14

Conflicts:
    drivers/net/wireless/ath/ath10k/debug.c

Changelog:
----------------------------------------------------------------
Alexandre Belloni (1):
      clocksource/drivers/timer-atmel-pit: Properly handle error cases

Andy Lutomirski (4):
      x86/vdso: Fix asm constraints on vDSO syscall fallbacks
      selftests/x86: Add clock_gettime() tests to test_vdso
      x86/vdso: Only enable vDSO retpolines when enabled and supported
      x86/vdso: Fix vDSO syscall fallback asm constraint regression

Arnaldo Carvalho de Melo (1):
      perf annotate: Use asprintf when formatting objdump command line

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

Chao Yu (1):
      f2fs: fix invalid memory access

Christophe Leroy (2):
      powerpc/lib/code-patching: refactor patch_instruction()
      powerpc/lib: fix book3s/32 boot failure due to code patching

Chunfeng Yun (1):
      usb: xhci-mtk: resume USB3 roothub first

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

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

Dmitry Safonov (1):
      tty: Drop tty->count on tty_reopen() failure

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

Greg Kroah-Hartman (1):
      Linux 4.14.76

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

Harsh Jain (1):
      crypto: chelsio - Fix memory corruption in DMA Mapped buffers.

Ilya Dryomov (1):
      blk-mq: I/O and timer unplugs are inverted in blktrace

James Smart (1):
      nvme_fc: fix ctrl create failures racing with workq items

Jan Beulich (1):
      xen-netback: fix input validation in xenvif_set_hash_mapping()

Jan Stancek (1):
      virtio_balloon: fix increment of vb->num_pfns in fill_balloon()

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

Jason Ekstrand (1):
      drm/syncobj: Don't leak fences when WAIT_FOR_SUBMIT is set

Jiri Olsa (2):
      perf tools: Fix python extension build for gcc 8
      perf utils: Move is_directory() to path.h

Joe Thornber (1):
      dm cache metadata: ignore hints array being too small during resize

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

Ka-Cheong Poon (1):
      rds: rds_ib_recv_alloc_cache() should call alloc_percpu_gfp() instead

Kirill A. Shutemov (1):
      mm, thp: fix mlocking THP page with migration enabled

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

Michael Neuling (1):
      powerpc: Avoid code patching freed init sections

Michael S. Tsirkin (1):
      virtio_balloon: fix deadlock on OOM

Mike Kravetz (1):
      mm: migration: fix migration of huge PMD shared pages

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

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

Reinette Chatre (1):
      perf/core: Add sanity check to deal with pinned event failure

Rex Zhu (1):
      drm/amdgpu: Fix vce work queue was not cancelled when suspend

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

Romain Izard (1):
      usb: cdc_acm: Do not leak URB buffers

Sean Christopherson (1):
      KVM: x86: fix L1TF's MMIO GFN calculation

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

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

Yu Wang (1):
      ath10k: fix kernel panic issue during pci probe

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

 Makefile                                        |   2 +-
 arch/arc/kernel/process.c                       |  20 +++
 arch/powerpc/include/asm/setup.h                |   1 +
 arch/powerpc/lib/code-patching.c                |  45 ++++---
 arch/powerpc/mm/mem.c                           |   2 +
 arch/x86/entry/vdso/Makefile                    |  16 ++-
 arch/x86/entry/vdso/vclock_gettime.c            |  26 ++--
 arch/x86/kvm/mmu.c                              |  24 +++-
 block/blk-mq.c                                  |   4 +-
 drivers/base/power/main.c                       |   5 +-
 drivers/clocksource/timer-atmel-pit.c           |  20 ++-
 drivers/crypto/chelsio/chcr_algo.c              |  41 ++++--
 drivers/crypto/chelsio/chcr_crypto.h            |   2 +
 drivers/gpu/drm/drm_syncobj.c                   |   5 +
 drivers/infiniband/core/ucma.c                  |   2 +
 drivers/md/dm-cache-metadata.c                  |   4 +-
 drivers/md/dm-cache-target.c                    |   9 +-
 drivers/net/wireless/ath/ath10k/debug.c         |  12 +-
 drivers/net/xen-netback/hash.c                  |  12 +-
 drivers/nvme/host/fc.c                          |   4 +
 drivers/of/unittest.c                           |  26 ++--
 drivers/pci/pci.c                               |  27 ++--
 drivers/tty/tty_io.c                            |  11 +-
 drivers/usb/class/cdc-acm.c                     |   6 +
 drivers/usb/host/xhci-mtk.c                     |   4 +-
 drivers/usb/host/xhci-pci.c                     |   2 +
 drivers/usb/serial/usb-serial-simple.c          |   3 +-
 drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c |   5 +-
 drivers/virtio/virtio_balloon.c                 |  23 +++-
 fs/f2fs/checkpoint.c                            |   9 +-
 fs/ubifs/super.c                                |   3 +
 include/linux/balloon_compaction.h              |  35 ++++-
 include/linux/hugetlb.h                         |  14 ++
 include/linux/mm.h                              |   6 +
 kernel/events/core.c                            |   6 +
 mm/balloon_compaction.c                         |  28 +++-
 mm/huge_memory.c                                |   2 +-
 mm/hugetlb.c                                    |  37 ++++-
 mm/migrate.c                                    |   3 +
 mm/rmap.c                                       |  42 +++++-
 mm/vmstat.c                                     |   3 +
 net/mac80211/cfg.c                              |   2 +-
 net/rds/ib.h                                    |   2 +-
 net/rds/ib_cm.c                                 |   2 +-
 net/rds/ib_recv.c                               |  10 +-
 tools/perf/builtin-script.c                     |  14 +-
 tools/perf/util/annotate.c                      |  17 ++-
 tools/perf/util/path.c                          |  14 ++
 tools/perf/util/path.h                          |   3 +
 tools/perf/util/setup.py                        |   2 +
 tools/testing/selftests/x86/test_vdso.c         | 172 ++++++++++++++++++++++++
 51 files changed, 647 insertions(+), 142 deletions(-)

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

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

[modify] https://crrev.com/605c1329d4e448307be1513406c7ba163e4dd3c3/drivers/net/wireless/ath/ath10k/debug.c

Status: Fixed (was: Started)
Cc: kbleicher@chromium.org ddavenp...@chromium.org dbehr@chromium.org yuzhao@chromium.org shiris...@amd.com
Labels: -Pri-3 Merge-Request-71 Pri-1
Merge requested for at least the following patches that came in with the v4.14.76 merge:

0c0dd182	Rex.Zhu@amd.com	drm/amdgpu: Fix vce work queue was not cancelled when suspend
5178716b	jannh@google.com	mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly (for b/112799156)

"at least" is vague. Let's declare that the merge request from #4 is for the two mentioned patches, and nothing else. Additional patches will trigger a separate merge request.

Project Member

Comment 6 by sheriffbot@chromium.org, Oct 18

Labels: -Merge-Request-71 Hotlist-Merge-Approved Merge-Approved-71
Your change meets the bar and is auto-approved for M71. Please go ahead and merge the CL to branch 3578 manually. Please contact milestone owner if you have questions.
Owners: benmason@(Android), kariahda@(iOS), kbleicher@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Project Member

Comment 7 by sheriffbot@chromium.org, Oct 22

Cc: djkurtz@google.com
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Labels: -Merge-Approved-71

Sign in to add a comment