New issue
Advanced search Search tips

Issue 913218 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Dec 13
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.14.87 into chromeos-4.14

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

Issue description

Merge v4.14.87 into chromeos-4.14

 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Dec 13

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

commit 38b0148c2f065af9bd0a2ebca65fb08693421c7c
Author: Guenter Roeck <groeck@chromium.org>
Date: Mon Dec 10 16:01:35 2018

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

Merge of v4.14.87 into chromeos-4.14

Conflicts:
    drivers/input/keyboard/cros_ec_keyb.c
    drivers/gpu/drm/msm/adreno/adreno_device.c

Changelog:
----------------------------------------------------------------
Adam Wong (1):
      Input: elan_i2c - add support for ELAN0621 touchpad

Alexey Brodkin (1):
      arc: [devboards] Add support of NFSv3 ACL

Andrea Arcangeli (5):
      userfaultfd: use ENOENT instead of EFAULT if the atomic copy user fails
      userfaultfd: shmem: allocate anonymous memory for MAP_PRIVATE shmem
      userfaultfd: shmem: add i_size checks
      userfaultfd: shmem: UFFDIO_COPY: set the page dirty if VM_WRITE is not set
      userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas

Andrea Parri (1):
      uprobes: Fix handle_swbp() vs. unregister() + register() race once more

Arnd Bergmann (5):
      drm: gma500: fix logic error
      scsi: bfa: convert to strlcpy/strlcat
      staging: rts5208: fix gcc-8 logic error warning
      kdb: use memmove instead of overlapping memcpy
      net: qed: use correct strncpy() size

Brian Norris (1):
      Input: cros_ec_keyb - fix button/switch capability reports

Cameron Gutman (1):
      Input: xpad - quirk all PDP Xbox One gamepads

Christian Hoff (1):
      Input: matrix_keypad - check for errors from of_get_named_gpio()

Daniel Lezcano (5):
      thermal/drivers/hisi: Remove the multiple sensors support
      thermal/drivers/hisi: Remove pointless lock
      thermal/drivers/hisi: Encapsulate register writes into helpers
      thermal/drivers/hisi: Fix configuration register setting
      thermal/drivers/hisi: Remove costly sensor inspection

Dmitry V. Levin (1):
      mips: fix mips_get_syscall_arg o32 check

Greg Kroah-Hartman (1):
      Linux 4.14.87

Guenter Roeck (3):
      kobject: Replace strncpy with memcpy
      kernfs: Replace strncpy with memcpy
      Merge remote-tracking branch 'origin/linux/v4.14.87' into merge/chromeos-4.14-v4.14.87

Guoqing Jiang (1):
      tipc: use destination length for copy string

Jan Kara (1):
      udf: Allow mounting volumes with incorrect identification strings

Johan Hovold (1):
      drm/msm: fix OF child-node lookup

Kevin Hilman (1):
      ARC: change defconfig defaults to ARCv2

Laura Abbott (2):
      kgdboc: Fix restrict error
      kgdboc: Fix warning with module build

Linus Torvalds (2):
      test_hexdump: use memcpy instead of strncpy
      unifdef: use memcpy instead of strncpy

Lyude Paul (3):
      drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config
      drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut()
      Input: synaptics - add PNP ID for ThinkPad P50 to SMBus

Martin Wilck (1):
      scsi: scsi_devinfo: cleanly zero-pad devinfo strings

Masahiro Yamada (2):
      reset: make device_reset_optional() really optional
      reset: remove remaining WARN_ON() in <linux/reset.h>

Mathias Kresin (1):
      MIPS: ralink: Fix mt7620 nd_sd pinmux

Michael Guralnik (1):
      IB/mlx5: Avoid load failure due to unknown link width

Nikolay Borisov (1):
      btrfs: Always try all copies when reading extent buffers

Noah Westervelt (1):
      Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15ARR

Patrick Gaskin (1):
      Input: elan_i2c - add ELAN0620 to the ACPI table

Pavel Tikhomirov (1):
      mm: cleancache: fix corruption on missed inode invalidation

Qu Wenruo (1):
      btrfs: tree-checker: Don't check max block group size as current max chunk size limit is unreliable

Roman Gushchin (1):
      mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo

Sagi Grimberg (1):
      iser: set sector for ambiguous mr status errors

Sam Bobroff (1):
      drm/ast: Fix incorrect free on ioregs

Sergio Correia (1):
      drm: set is_master to 0 upon drm_new_set_master() failure

Stephen Rothwell (1):
      disable stringop truncation warnings for now

Sultan Alsawaf (1):
      ip_tunnel: Fix name string concatenate in __ip_tunnel_create()

Takashi Iwai (2):
      ALSA: intel_hdmi: Use strlcpy() instead of strncpy()
      ALSA: trident: Suppress gcc string warning

Wei Wang (1):
      svm: Add mutex_lock to protect apic_access_page_done on AMD systems

Xiongfeng Wang (1):
      Kbuild: suppress packed-not-aligned warning for default setting only

 Makefile                                     |   5 +-
 arch/arc/Kconfig                             |   2 +-
 arch/arc/Makefile                            |   2 +-
 arch/arc/configs/axs101_defconfig            |   2 +
 arch/arc/configs/axs103_defconfig            |   1 +
 arch/arc/configs/axs103_smp_defconfig        |   1 +
 arch/arc/configs/hsdk_defconfig              |   1 +
 arch/arc/configs/nps_defconfig               |   2 +
 arch/arc/configs/nsim_700_defconfig          |   1 +
 arch/arc/configs/nsimosci_defconfig          |   2 +
 arch/arc/configs/nsimosci_hs_defconfig       |   1 +
 arch/arc/configs/nsimosci_hs_smp_defconfig   |   1 +
 arch/arc/configs/tb10x_defconfig             |   1 +
 arch/arc/configs/vdk_hs38_defconfig          |   1 +
 arch/arc/configs/vdk_hs38_smp_defconfig      |   1 +
 arch/mips/include/asm/syscall.h              |   2 +-
 arch/mips/ralink/mt7620.c                    |   2 +-
 arch/x86/kvm/svm.c                           |  19 +-
 drivers/gpu/drm/ast/ast_main.c               |   3 +-
 drivers/gpu/drm/drm_auth.c                   |   2 +
 drivers/gpu/drm/gma500/mdfld_intel_display.c |   2 +-
 drivers/gpu/drm/meson/meson_dw_hdmi.c        |   1 +
 drivers/gpu/drm/meson/meson_viu.c            |  12 +-
 drivers/infiniband/hw/mlx5/main.c            |  29 +--
 drivers/infiniband/ulp/iser/iser_verbs.c     |   7 +-
 drivers/input/joystick/xpad.c                |  16 +-
 drivers/input/keyboard/matrix_keypad.c       |  23 +-
 drivers/input/mouse/elan_i2c_core.c          |   3 +
 drivers/input/mouse/synaptics.c              |   1 +
 drivers/net/ethernet/qlogic/qed/qed_debug.c  |   6 +-
 drivers/reset/core.c                         |   9 +-
 drivers/scsi/bfa/bfa_fcbuild.c               |   8 +-
 drivers/scsi/bfa/bfa_fcs.c                   |  78 +++----
 drivers/scsi/bfa/bfa_fcs_lport.c             |  62 ++----
 drivers/scsi/bfa/bfa_ioc.c                   |   2 +-
 drivers/scsi/bfa/bfa_svc.c                   |   4 +-
 drivers/scsi/bfa/bfad.c                      |  20 +-
 drivers/scsi/bfa/bfad_attr.c                 |   2 +-
 drivers/scsi/bfa/bfad_bsg.c                  |   6 +-
 drivers/scsi/scsi_devinfo.c                  |  22 +-
 drivers/staging/rts5208/sd.c                 |   6 -
 drivers/thermal/hisi_thermal.c               | 318 ++++++++++++++-------------
 drivers/tty/serial/kgdboc.c                  |  43 ++--
 fs/btrfs/disk-io.c                           |  10 +-
 fs/btrfs/tree-checker.c                      |   8 +-
 fs/kernfs/symlink.c                          |   2 +-
 fs/udf/super.c                               |  16 +-
 fs/udf/unicode.c                             |  14 +-
 fs/userfaultfd.c                             |  15 ++
 include/linux/reset.h                        |  34 ++-
 kernel/debug/kdb/kdb_support.c               |   4 +-
 kernel/events/uprobes.c                      |  12 +-
 lib/kobject.c                                |   2 +-
 lib/test_hexdump.c                           |   2 +-
 mm/hugetlb.c                                 |   2 +-
 mm/shmem.c                                   |  31 ++-
 mm/truncate.c                                |   8 +-
 mm/userfaultfd.c                             |  62 ++++--
 mm/vmstat.c                                  |   4 +
 net/ipv4/ip_tunnel.c                         |   4 +-
 net/tipc/subscr.c                            |   2 +-
 scripts/Makefile.extrawarn                   |   3 +
 scripts/unifdef.c                            |   4 +-
 sound/pci/trident/trident.c                  |   2 +-
 sound/x86/intel_hdmi_audio.c                 |   2 +-
 65 files changed, 532 insertions(+), 443 deletions(-)

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

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

[modify] https://crrev.com/38b0148c2f065af9bd0a2ebca65fb08693421c7c/drivers/gpu/drm/msm/adreno/adreno_device.c
[modify] https://crrev.com/38b0148c2f065af9bd0a2ebca65fb08693421c7c/drivers/input/keyboard/cros_ec_keyb.c

Status: Fixed (was: Started)

Sign in to add a comment