New issue
Advanced search Search tips

Issue 826955 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Apr 2018
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.125 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Mar 28 2018

Issue description

Merge v.4.4.125 into chromeos-4.4

 

Comment 1 by groeck@chromium.org, Mar 28 2018

Labels: OS-Chrome

Comment 2 by groeck@chromium.org, Mar 30 2018

Status: Started (was: Assigned)
Project Member

Comment 3 by bugdroid1@chromium.org, Apr 2 2018

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

commit 6c00363cbe51a8fb1ad04180b0f29b8358a0f911
Author: Guenter Roeck <groeck@chromium.org>
Date: Fri Mar 30 18:54:55 2018

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

Merge of v4.4.125 into chromeos-4.4

Conflicts:
    arch/x86/kernel/traps.c

Changelog:
----------------------------------------------------------------
Andri Yngvason (3):
      can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack
      can: cc770: Fix queue stall & dropped RTR reply
      can: cc770: Fix use after free in cc770_tx_interrupt()

Andy Lutomirski (1):
      x86/entry/64: Don't use IST entry for #BP stack

Arend Van Spriel (1):
      brcmfmac: fix P2P_DEVICE ethernet address generation

Boris Brezillon (1):
      clk: bcm2835: Protect sections updating shared registers

Chenbo Feng (1):
      bpf: skip unnecessary capability check

Dan Carpenter (2):
      staging: ncpfs: memory corruption in ncp_read_kernel()
      perf/x86/intel: Don't accidentally clear high bits in bdw_limit_period()

Dan Williams (1):
      acpi, numa: fix pxm to online numa node associations

Daniel Borkmann (2):
      kbuild: disable clang's default use of -fmerge-all-constants
      bpf, x64: increase number of passes

Eric Biggers (2):
      libata: fix length validation of ATAPI-relayed SCSI commands
      libata: remove WARN() for DMA or PIO command without data

Evgeniy Didin (1):
      mmc: dw_mmc: fix falling from idmac to PIO mode when dw_mci_reset occurs

Greg Kroah-Hartman (2):
      drm: udl: Properly check framebuffer mmap offsets
      Linux 4.4.125

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

H.J. Lu (2):
      x86/build/64: Force the linker to use 2MB page size
      x86/boot/64: Verify alignment of the LOAD segment

Hans de Goede (6):
      PCI: Add function 1 DMA alias quirk for Highpoint RocketRAID 644L
      ahci: Add PCI-id for the Highpoint Rocketraid 644L card
      libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs
      libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs
      libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions
      libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version

Jagdish Gediya (1):
      mtd: nand: fsl_ifc: Fix nand waitfunc return value

Ju Hyung Park (1):
      libata: Enable queued TRIM for Samsung SSD 860

Kai-Heng Feng (1):
      libata: disable LPM for Crucial BX100 SSD 500GB drive

Kirill Marinushkin (1):
      ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit

Larry Finger (1):
      rtlwifi: rtl8723be: Fix loss of signal

Linus Torvalds (2):
      tty: vt: fix up tabstops properly
      kvm/x86: fix icebp instruction handling

Masami Hiramatsu (1):
      tracing: probeevent: Fix to support minus offset from symbol

Michael Nosthoff (1):
      iio: st_pressure: st_accel: pass correct platform data to init

Michel Dänzer (1):
      drm/radeon: Don't turn off DP sink when disconnected

Nadav Amit (1):
      staging: lustre: ptlrpc: kfree used instead of kvfree

NeilBrown (1):
      MIPS: ralink: Remove ralink_halt()

Takashi Iwai (4):
      ALSA: aloop: Sync stale timer before release
      ALSA: aloop: Fix access to not-yet-ready substream via cable
      ALSA: hda/realtek - Always immediately update mute LED with pin VREF
      Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174

Thomas Hellstrom (1):
      drm/vmwgfx: Fix a destoy-while-held mutex problem.

Toshi Kani (2):
      mm/vmalloc: add interfaces to free unmapped page table
      x86/mm: implement free pmd/pte page interfaces

 Makefile                                           |  11 ++-
 arch/arm64/mm/mmu.c                                |  12 +++
 arch/mips/ralink/reset.c                           |   7 --
 arch/x86/Makefile                                  |   9 ++
 arch/x86/boot/compressed/misc.c                    |   4 +
 arch/x86/entry/entry_64.S                          |   2 +-
 arch/x86/include/asm/vmx.h                         |   1 +
 arch/x86/kernel/cpu/perf_event_intel.c             |   2 +-
 arch/x86/kernel/traps.c                            |  24 +++--
 arch/x86/kvm/vmx.c                                 |   9 +-
 arch/x86/mm/pgtable.c                              |  48 ++++++++++
 arch/x86/net/bpf_jit_comp.c                        |   3 +-
 drivers/acpi/numa.c                                |  10 ++-
 drivers/ata/ahci.c                                 |   4 +-
 drivers/ata/libata-core.c                          |  26 +++++-
 drivers/ata/libata-scsi.c                          |   4 +-
 drivers/bluetooth/btusb.c                          |   2 +-
 drivers/clk/bcm/clk-bcm2835.c                      |   4 +
 drivers/gpu/drm/radeon/radeon_connectors.c         |  31 +++----
 drivers/gpu/drm/udl/udl_fb.c                       |   9 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |  28 ++++--
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |  12 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |   5 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |   5 +-
 drivers/iio/accel/st_accel_core.c                  |   2 +-
 drivers/iio/pressure/st_pressure_core.c            |   2 +-
 drivers/mmc/host/dw_mmc.c                          |   6 +-
 drivers/mtd/nand/fsl_ifc_nand.c                    |   5 +-
 drivers/net/can/cc770/cc770.c                      | 100 +++++++++++++--------
 drivers/net/can/cc770/cc770.h                      |   2 +
 .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c |  24 +++--
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |   3 +-
 drivers/pci/quirks.c                               |   2 +
 drivers/staging/lustre/lustre/ptlrpc/sec.c         |   2 +-
 drivers/tty/vt/vt.c                                |   8 +-
 fs/ncpfs/ncplib_kernel.c                           |   4 +
 include/asm-generic/pgtable.h                      |  10 +++
 include/uapi/linux/usb/audio.h                     |   4 +-
 kernel/bpf/syscall.c                               |   2 +-
 kernel/trace/trace_kprobe.c                        |   4 +-
 kernel/trace/trace_probe.c                         |   8 +-
 kernel/trace/trace_probe.h                         |   2 +-
 lib/ioremap.c                                      |   6 +-
 sound/drivers/aloop.c                              |  17 +++-
 sound/pci/hda/patch_realtek.c                      |   6 +-
 45 files changed, 339 insertions(+), 152 deletions(-)

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

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

[delete] https://crrev.com/7a0069ff1728565b4ccbd8603dcc066215180b7b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
[modify] https://crrev.com/6c00363cbe51a8fb1ad04180b0f29b8358a0f911/arch/x86/kernel/traps.c
[modify] https://crrev.com/6c00363cbe51a8fb1ad04180b0f29b8358a0f911/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c

Status: Fixed (was: Started)

Sign in to add a comment