New issue
Advanced search Search tips

Issue 800884 link

Starred by 1 user

Issue metadata

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



Sign in to add a comment

Merge v4.14.13 into chromeos-4.14

Project Member Reported by groeck@chromium.org, Jan 10 2018

Issue description

Merge v4.14.13 into chromeos-4.14

 

Comment 1 by groeck@chromium.org, Jan 10 2018

Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Jan 13 2018

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

commit 78cecade07f127f10f45dfcc872cc4c85ddde09b
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Jan 10 23:51:03 2018

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

Merge of v4.14.13 into chromeos-4.14

Changelog:
----------------------------------------------------------------
Aaron Ma (1):
      Input: elantech - add new icbody type 15

Andrea Arcangeli (1):
      userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails

Andrey Ryabinin (1):
      x86/mm: Set MODULES_END to 0xffffffffff000000

Anshuman Khandual (1):
      mm/mprotect: add a cond_resched() inside change_pmd_range()

Ard Biesheuvel (1):
      efi/capsule-loader: Reinstate virtual capsule mapping

Arnd Bergmann (1):
      crypto: chelsio - select CRYPTO_GF128MUL

Baoquan He (1):
      mm/sparse.c: wrong allocation for mem_section

Boris Brezillon (1):
      mtd: nand: pxa3xx: Fix READOOB implementation

Chris Mason (1):
      btrfs: fix refcount_t usage when deleting btrfs_delayed_nodes

Christian Borntraeger (2):
      KVM: s390: fix cmma migration for multiple memory slots
      KVM: s390: prevent buffer overrun on memory hotplug during migration

David Howells (1):
      fscache: Fix the default for fscache_maybe_release_page()

David Woodhouse (1):
      x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm

Eric Biggers (2):
      crypto: chacha20poly1305 - validate the digest size
      crypto: pcrypt - fix freeing pcrypt instances

Greg Kroah-Hartman (1):
      Linux 4.14.13

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

Helge Deller (2):
      parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
      parisc: qemu idle sleep support

Jan Engelhardt (1):
      crypto: n2 - cure use after free

Jean-Philippe Brucker (1):
      iommu/arm-smmu-v3: Don't free page table ops twice

John Johansen (1):
      apparmor: fix regression in mount mediation when feature set is pinned

John Sperbeck (1):
      powerpc/mm: Fix SEGV on mapped region to return SEGV_ACCERR

Lucas De Marchi (1):
      drm/i915: Apply Display WA #1183 on skl, kbl, and cfl

Oleg Nesterov (4):
      kernel/acct.c: fix the acct->needcheck check in check_free_space()
      kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks from SIGKILL
      kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
      kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE check in complete_signal()

Peter Zijlstra (1):
      x86/events/intel/ds: Use the proper cache flush method for mapping ds buffers

Rafael J. Wysocki (2):
      x86 / CPU: Avoid unnecessary IPIs in arch_freq_get_on_cpu()
      x86 / CPU: Always show current CPU frequency in /proc/cpuinfo

Robin Murphy (1):
      iommu/arm-smmu-v3: Cope with duplicated Stream IDs

Stefan Brüns (1):
      sunxi-rsb: Include OF based modalias in device uevent

Thomas Gleixner (4):
      x86/mm: Map cpu_entry_area at the same place on 4/5 level
      x86/kaslr: Fix the vaddr_end mess
      x86/tlb: Drop the _GPL from the cpu_tlbstate export
      x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN

Tom Lendacky (1):
      x86/microcode/AMD: Add support for fam17h microcode loading

Ville Syrjälä (1):
      drm/i915: Disable DC states around GMBUS on GLK

Vineet Gupta (1):
      ARC: uaccess: dont use "l" gcc inline asm constraint modifier

 Documentation/x86/x86_64/mm.txt         | 18 +++++----
 Makefile                                |  2 +-
 arch/arc/include/asm/uaccess.h          |  5 ++-
 arch/parisc/include/asm/ldcw.h          |  2 +
 arch/parisc/kernel/entry.S              | 13 +++++-
 arch/parisc/kernel/pacache.S            |  9 ++++-
 arch/parisc/kernel/process.c            | 39 ++++++++++++++++++
 arch/powerpc/mm/fault.c                 |  7 +++-
 arch/s390/kvm/kvm-s390.c                |  9 +++--
 arch/s390/kvm/priv.c                    |  2 +-
 arch/x86/events/intel/ds.c              | 16 ++++++++
 arch/x86/include/asm/alternative.h      |  4 +-
 arch/x86/include/asm/cpufeatures.h      |  2 +-
 arch/x86/include/asm/pgtable_64_types.h | 14 +++++--
 arch/x86/kernel/cpu/Makefile            |  2 +-
 arch/x86/kernel/cpu/aperfmperf.c        | 71 ++++++++++++++++++++++++---------
 arch/x86/kernel/cpu/common.c            |  2 +-
 arch/x86/kernel/cpu/cpu.h               |  3 ++
 arch/x86/kernel/cpu/microcode/amd.c     |  4 ++
 arch/x86/kernel/cpu/proc.c              |  6 ++-
 arch/x86/mm/dump_pagetables.c           |  2 +-
 arch/x86/mm/init.c                      |  2 +-
 arch/x86/mm/kaslr.c                     | 32 +++++----------
 arch/x86/mm/pti.c                       |  6 +--
 arch/x86/platform/efi/quirks.c          | 13 +++++-
 crypto/chacha20poly1305.c               |  6 ++-
 crypto/pcrypt.c                         | 19 ++++-----
 drivers/bus/sunxi-rsb.c                 |  1 +
 drivers/crypto/chelsio/Kconfig          |  1 +
 drivers/crypto/n2_core.c                |  3 ++
 drivers/firmware/efi/capsule-loader.c   | 45 +++++++++++++++++----
 drivers/gpu/drm/i915/i915_reg.h         |  2 +
 drivers/gpu/drm/i915/intel_cdclk.c      | 35 +++++++++++-----
 drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++
 drivers/input/mouse/elantech.c          |  2 +-
 drivers/iommu/arm-smmu-v3.c             | 17 ++++++--
 drivers/mtd/nand/pxa3xx_nand.c          |  1 +
 fs/btrfs/delayed-inode.c                | 45 ++++++++++++++++-----
 fs/proc/cpuinfo.c                       |  6 +++
 fs/userfaultfd.c                        | 20 +++++++++-
 include/linux/cpufreq.h                 |  1 +
 include/linux/efi.h                     |  4 +-
 include/linux/fscache.h                 |  2 +-
 kernel/acct.c                           |  2 +-
 kernel/signal.c                         | 18 +++++----
 mm/mprotect.c                           |  6 ++-
 mm/sparse.c                             |  2 +-
 security/apparmor/mount.c               | 12 +++++-
 48 files changed, 408 insertions(+), 138 deletions(-)

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

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


Comment 3 by groeck@chromium.org, Jan 13 2018

Status: Fixed (was: Started)

Sign in to add a comment