New issue
Advanced search Search tips

Issue 875049 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Aug 23
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.149 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Aug 16

Issue description

Merge v4.4.149 into chromeos-4.4

Note: v4.4.149 was superseded with v4.4.150 to fix an L1TF related regression. Will do that seperately to keep things simple.

 
Description: Show this description
Description: Show this description
Summary: Merge v4.4.150 into chromeos-4.4 (was: Merge v4.4.149 into chromeos-4.4)
Description: Show this description
Summary: Merge v4.4.149 into chromeos-4.4 (was: Merge v4.4.150 into chromeos-4.4)
Status: Started (was: Assigned)
Project Member

Comment 7 by bugdroid1@chromium.org, Aug 21

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

commit b01d574c8e4fda18e4a9c20d8c01b6bc27436e2d
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Aug 21 04:43:05 2018

Revert "CHROMIUM: ASoC: cht_bsw_max98090_ti: Fix NULL pointer dereference while accessing jack"

This reverts commit 989cedd282bcb1c719e6dd777de8eddb4f6c7a99.

Needed to prepare for merge of v4.4.149, which includes the upstream
fix for the problem.

BUG= chromium:875049 
TEST=Build and boot with affected system after merge

Change-Id: I5525491bc06883d3f5c3cea6ea1369c23e659d26
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1179259

[modify] https://crrev.com/b01d574c8e4fda18e4a9c20d8c01b6bc27436e2d/sound/soc/intel/boards/cht_bsw_max98090_ti.c

Project Member

Comment 8 by bugdroid1@chromium.org, Aug 23

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

commit aa9f07a3749ae33849d7595485c30b4fc5912a27
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Aug 21 13:24:36 2018

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

Merge of v4.4.149 into chromeos-4.4

Conflicts:
    scripts/Makefile.lib
    Makefile

Changelog:
----------------------------------------------------------------
Andrey Konovalov (1):
      kasan: don't emit builtin calls when sanitization is off

Chintan Pandya (1):
      ioremap: Update pgtable free interfaces with addr

Eric Biggers (4):
      crypto: vmac - require a block cipher with 128-bit block size
      crypto: vmac - separate tfm and request context
      crypto: blkcipher - fix crash flushing dcache in error path
      crypto: ablkcipher - fix crash flushing dcache in error path

Greg Kroah-Hartman (1):
      Linux 4.4.149

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

Liwei Song (1):
      i2c: ismt: fix wrong device address when unmap the data buffer

Mark Salyzyn (1):
      Bluetooth: hidp: buffer overflow in hidp_process_report

Randy Dunlap (1):
      kbuild: verify that $DEPMOD is installed

Takashi Iwai (1):
      tcp: Fix missing range_truesize enlargement in the backport

Thierry Escande (1):
      ASoC: Intel: cht_bsw_max98090_ti: Fix jack initialization

Toshi Kani (2):
      x86/mm: Disable ioremap free page handling on x86-PAE
      x86/mm: Add TLB purge to free pmd/pte page interfaces

 Documentation/Changes                        |  17 +-
 Makefile                                     |   2 +-
 arch/arm64/mm/mmu.c                          |   4 +-
 arch/x86/mm/pgtable.c                        |  61 +++-
 crypto/ablkcipher.c                          |  57 ++--
 crypto/blkcipher.c                           |  54 ++--
 crypto/vmac.c                                | 412 ++++++++++++---------------
 drivers/i2c/busses/i2c-ismt.c                |   2 +-
 include/asm-generic/pgtable.h                |   8 +-
 include/crypto/vmac.h                        |  63 ----
 lib/ioremap.c                                |   4 +-
 net/bluetooth/hidp/core.c                    |   4 +-
 net/ipv4/tcp_input.c                         |   1 +
 scripts/depmod.sh                            |   8 +-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c |  45 ++-
 15 files changed, 347 insertions(+), 395 deletions(-)
 delete mode 100644 include/crypto/vmac.h

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

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

[modify] https://crrev.com/aa9f07a3749ae33849d7595485c30b4fc5912a27/scripts/Makefile.lib
[modify] https://crrev.com/aa9f07a3749ae33849d7595485c30b4fc5912a27/Makefile

Status: Fixed (was: Started)

Sign in to add a comment