Merge v4.4.138 into chromeos-4.4 |
||||
Issue descriptionMerge v4.4.138 into chromeos-4.4 Higher priority than usual since CVE fixes are known to be included in this release.
,
Jun 18 2018
Is it worth it to cherrypick them into older chromiumos branches (m65 for example)? +sawlani, to evaluate it for lakitu m65.
,
Jun 18 2018
We will cherry-pick the relevant changes into M-68 but not into older releases. See crbug.com/849843 for further details.
,
Jun 18 2018
I don't have access to crbug.com/849843. Guenter can you help please.
,
Jun 18 2018
#4: Please try again.
,
Jun 20 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/2bcca24d5498daf6aa69e71ebdd54e5b656f26cb commit 2bcca24d5498daf6aa69e71ebdd54e5b656f26cb Author: Guenter Roeck <groeck@chromium.org> Date: Mon Jun 18 16:08:23 2018 CHROMIUM: Merge 'v4.4.138' into chromeos-4.4 Merge of v4.4.138 into chromeos-4.4 Conflicts: arch/x86/kernel/fpu/init.c Changelog: ---------------------------------------------------------------- Andy Lutomirski (6): x86/fpu: Default eagerfpu=on on all CPUs x86/fpu: Fix 'no387' regression x86/fpu: Hard-disable lazy FPU mode x86/fpu: Fix FNSAVE usage in eagerfpu mode x86/fpu: Fix math emulation in eager fpu mode x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code Borislav Petkov (2): x86/cpufeature: Remove unused and seldomly used cpu_has_xx macros x86/fpu: Fix eager-FPU handling on legacy FPU machines Ethan Lee (1): Input: goodix - add new ACPI id for GPD Win 2 touch screen Gil Kupfer (1): vmw_balloon: fixing double free when batching mode is off Greg Kroah-Hartman (1): Linux 4.4.138 Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.4.138' into merge/chromeos-4.4-v4.4.138 Johannes Wienke (1): Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID Juergen Gross (1): x86: Remove unused function cpu_has_ht_siblings() Kevin Easton (1): af_key: Always verify length of provided sadb_key Linus Torvalds (1): Clarify (and fix) MAX_LFS_FILESIZE macros Linus Walleij (1): gpio: No NULL owner Marek Szyprowski (1): serial: samsung: fix maxburst parameter for DMA transactions Michael Ellerman (1): crypto: vmx - Remove overly verbose printk from AES init routines Paolo Bonzini (3): KVM: x86: introduce linear_{read,write}_system KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access Yu-cheng Yu (1): x86/fpu: Revert ("x86/fpu: Disable AVX when eagerfpu is off") yu-cheng yu (3): x86/fpu: Fix early FPU command-line parsing x86/fpu: Disable MPX when eagerfpu is off x86/fpu: Disable AVX when eagerfpu is off Makefile | 2 +- arch/x86/crypto/chacha20_glue.c | 2 +- arch/x86/crypto/crc32c-intel_glue.c | 7 +- arch/x86/include/asm/cmpxchg_32.h | 2 +- arch/x86/include/asm/cmpxchg_64.h | 2 +- arch/x86/include/asm/cpufeature.h | 39 +------ arch/x86/include/asm/fpu/internal.h | 6 +- arch/x86/include/asm/fpu/xstate.h | 2 +- arch/x86/include/asm/kvm_emulate.h | 6 +- arch/x86/include/asm/smp.h | 9 -- arch/x86/include/asm/xor_32.h | 2 +- arch/x86/kernel/cpu/amd.c | 4 +- arch/x86/kernel/cpu/common.c | 4 +- arch/x86/kernel/cpu/intel.c | 3 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 6 +- arch/x86/kernel/cpu/mtrr/generic.c | 2 +- arch/x86/kernel/cpu/mtrr/main.c | 2 +- arch/x86/kernel/cpu/perf_event_amd.c | 4 +- arch/x86/kernel/cpu/perf_event_amd_uncore.c | 11 +- arch/x86/kernel/fpu/core.c | 24 +++- arch/x86/kernel/fpu/init.c | 169 +++++++--------------------- arch/x86/kernel/fpu/xstate.c | 3 +- arch/x86/kernel/hw_breakpoint.c | 6 +- arch/x86/kernel/smpboot.c | 2 +- arch/x86/kernel/traps.c | 1 - arch/x86/kernel/vm86_32.c | 4 +- arch/x86/kvm/emulate.c | 72 ++++++------ arch/x86/kvm/vmx.c | 23 ++-- arch/x86/kvm/x86.c | 51 ++++++--- arch/x86/kvm/x86.h | 4 +- arch/x86/mm/setup_nx.c | 4 +- drivers/char/hw_random/via-rng.c | 5 +- drivers/crypto/padlock-aes.c | 2 +- drivers/crypto/padlock-sha.c | 2 +- drivers/crypto/vmx/aes.c | 2 - drivers/crypto/vmx/aes_cbc.c | 2 - drivers/crypto/vmx/aes_ctr.c | 2 - drivers/crypto/vmx/ghash.c | 2 - drivers/gpio/gpiolib.c | 9 +- drivers/input/mouse/elan_i2c_core.c | 1 + drivers/input/touchscreen/goodix.c | 1 + drivers/iommu/intel_irq_remapping.c | 2 +- drivers/misc/vmw_balloon.c | 23 ++-- drivers/tty/serial/samsung.c | 7 +- fs/btrfs/disk-io.c | 2 +- include/linux/fs.h | 4 +- net/key/af_key.c | 45 ++++++-- 47 files changed, 258 insertions(+), 331 deletions(-) BUG= chromium:852812 TEST=Build and test on various affected systems Change-Id: I652051554e2ec96075d26822058edcf70d37426b Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/2bcca24d5498daf6aa69e71ebdd54e5b656f26cb/arch/x86/kernel/fpu/init.c
,
Jun 20 2018
|
||||
►
Sign in to add a comment |
||||
Comment 1 by groeck@chromium.org
, Jun 18 2018