New issue
Advanced search Search tips

Issue 903567 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Nov 15
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.14.80 into chromeos-4.14

Project Member Reported by groeck@chromium.org, Nov 8

Issue description

Merge v4.14.80 into chromeos-4.14


 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Nov 15

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

commit c269e06c9ba63fad94c9cc1c85b726f3c30c9d3f
Author: Guenter Roeck <groeck@chromium.org>
Date: Sat Nov 10 20:05:19 2018

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

Merge of v4.14.80 into chromeos-4.14

Conflicts:
    arch/x86/kernel/tsc.c

Changelog:
----------------------------------------------------------------
Al Viro (1):
      cachefiles: fix the race between cachefiles_bury_object() and rmdir(2)

Alan Chiang (1):
      eeprom: at24: Add support for address-width property

Alan Stern (1):
      USB: fix the usbfs flag sanitization for control transfers

Amir Goldstein (2):
      vfs: swap names of {do,vfs}_clone_file_range()
      fsnotify: fix ignore mask logic in fsnotify()

Brian Foster (1):
      xfs: truncate transaction does not modify the inobt

Christophe Leroy (1):
      net: fs_enet: do not call phy_stop() in interrupts

Clint Taylor (1):
      drm/edid: VSDB yCBCr420 Deep Color mode bit definitions

Daniel Borkmann (1):
      bpf: fix partial copy of map_ptr when dst is scalar

Eugeniy Paltsev (1):
      drm: fb-helper: Reject all pixel format changing requests

Greg Kroah-Hartman (1):
      Linux 4.14.80

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

Gustavo A. R. Silva (4):
      ptp: fix Spectre v1 vulnerability
      RDMA/ucma: Fix Spectre v1 vulnerability
      IB/ucm: Fix Spectre v1 vulnerability
      usb: gadget: storage: Fix Spectre v1 vulnerability

Johan Hovold (1):
      USB: serial: option: add two-endpoints device-id flag

Kai-Heng Feng (1):
      drm/edid: Add 6 bpc quirk for BOE panel in HP Pavilion 15-n233sl

Kristian Evensen (1):
      USB: serial: option: improve Quectel EP06 detection

Linus Walleij (1):
      gpio: mxs: Get rid of external API call

Mikhail Nikiforov (1):
      Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM

Nathan Chancellor (1):
      x86/time: Correct the attribute on jiffies' definition

Oliver Neukum (1):
      cdc-acm: fix race between reset and control messaging

Peter Zijlstra (2):
      x86/tsc: Force inlining of cyc2ns bits
      x86/percpu: Fix this_cpu_read()

Phil Auld (1):
      sched/fair: Fix throttle_list starvation with low CFS quota

Sasha Levin (1):
      Revert "ARM: tegra: Fix ULPI regression on Tegra20"

Sebastian Andrzej Siewior (1):
      x86/fpu: Fix i486 + no387 boot crash by only saving FPU registers on context switch if there is an FPU

Shuah Khan (Samsung OSG) (1):
      usb: usbip: Fix BUG: KASAN: slab-out-of-bounds in vhci_hub_control()

Tobias Herzog (2):
      cdc-acm: do not reset notification buffer index upon urb unlinking
      cdc-acm: correct counting of UART states in serial state notification

Zhimin Gu (1):
      x86, hibernate: Fix nosave_regions setup for hibernation

 Makefile                                           |  2 +-
 arch/arm/boot/dts/tegra20.dtsi                     |  2 +-
 arch/x86/include/asm/fpu/internal.h                |  2 +-
 arch/x86/include/asm/percpu.h                      |  8 +-
 arch/x86/kernel/setup.c                            |  2 +-
 arch/x86/kernel/time.c                             |  2 +-
 arch/x86/kernel/tsc.c                              |  6 +-
 drivers/gpio/gpio-mxs.c                            |  4 +-
 drivers/gpu/drm/drm_edid.c                         |  5 +-
 drivers/gpu/drm/drm_fb_helper.c                    | 91 +++++++---------------
 drivers/infiniband/core/ucm.c                      |  3 +
 drivers/infiniband/core/ucma.c                     |  3 +
 drivers/input/mouse/elan_i2c_core.c                |  1 +
 drivers/misc/eeprom/at24.c                         | 17 ++++
 .../net/ethernet/freescale/fs_enet/fs_enet-main.c  | 16 +++-
 drivers/net/ethernet/freescale/fs_enet/fs_enet.h   |  1 +
 drivers/ptp/ptp_chardev.c                          |  4 +
 drivers/usb/class/cdc-acm.c                        | 16 ++--
 drivers/usb/core/devio.c                           |  4 +-
 drivers/usb/gadget/function/f_mass_storage.c       |  3 +
 drivers/usb/serial/option.c                        | 15 +++-
 drivers/usb/usbip/vhci_hcd.c                       | 57 ++++++++++----
 fs/cachefiles/namei.c                              |  2 +-
 fs/ioctl.c                                         |  2 +-
 fs/nfsd/vfs.c                                      |  3 +-
 fs/notify/fsnotify.c                               | 14 ++--
 fs/overlayfs/copy_up.c                             |  2 +-
 fs/read_write.c                                    | 17 +++-
 fs/xfs/libxfs/xfs_trans_resv.c                     |  9 +--
 include/drm/drm_edid.h                             |  6 +-
 include/linux/bpf_verifier.h                       |  3 +
 include/linux/fs.h                                 | 17 +---
 kernel/bpf/verifier.c                              | 10 ++-
 kernel/sched/fair.c                                | 22 +++++-
 kernel/sched/sched.h                               |  2 +
 35 files changed, 215 insertions(+), 158 deletions(-)

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

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

[modify] https://crrev.com/c269e06c9ba63fad94c9cc1c85b726f3c30c9d3f/arch/x86/kernel/tsc.c

Status: Fixed (was: Started)

Sign in to add a comment