New issue
Advanced search Search tips

Issue 913219 link

Starred by 1 user

Issue metadata

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



Sign in to add a comment

Merge v4.19.8 into chromeos-4.19

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

Issue description

Merge v4.19.8 into chromeos-4.19
 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Dec 12

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

commit d9b2e232772d9ffb5014dd1329c301e8b35a8f55
Author: Guenter Roeck <groeck@chromium.org>
Date: Mon Dec 10 15:51:02 2018

CHROMIUM: Merge 'v4.19.8' into chromeos-4.19

Merge of v4.19.8 into chromeos-4.19

Conflicts:
    drivers/input/keyboard/cros_ec_keyb.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 (4):
      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

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

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()

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

Frieder Schrempf (1):
      mtd: nand: Fix memory allocation in nanddev_bbt_init()

Greg Kroah-Hartman (1):
      Linux 4.19.8

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

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

Jens Axboe (2):
      blk-mq: fix corruption with direct issue
      blk-mq: punt failed direct issue to dispatch list

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

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

Lihong Yang (1):
      i40e: Fix deletion of MAC filters

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

Lyude Paul (4):
      drm/amd/dm: Don't forget to attach MST encoders
      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: lpfc: fix block guard enablement on SLI3 adapters

Masami Hiramatsu (1):
      arm64: ftrace: Fix to enable syscall events on arm64

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

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

Neil Armstrong (1):
      drm/meson: Fixes for drm_crtc_vblank_on/off support

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

Paul Moore (1):
      selinux: add support for RTM_NEWCHAIN, RTM_DELCHAIN, and RTM_GETCHAIN

Pavankumar Kondeti (1):
      sched, trace: Fix prev_state output in sched_switch tracepoint

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

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

Steven Rostedt (VMware) (1):
      tracing/fgraph: Fix set_graph_function from showing interrupts

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

Zenghui Yu (1):
      tracepoint: Use __idx instead of idx in DO_TRACE macro to make it unique

 Makefile                                           |  2 +-
 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/arm64/include/asm/ftrace.h                    | 13 +++++
 arch/mips/include/asm/syscall.h                    |  2 +-
 arch/mips/ralink/mt7620.c                          |  2 +-
 arch/x86/kvm/svm.c                                 | 19 +++++---
 block/blk-mq.c                                     |  7 +--
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |  2 +
 drivers/gpu/drm/ast/ast_main.c                     |  3 +-
 drivers/gpu/drm/drm_auth.c                         |  2 +
 drivers/gpu/drm/meson/meson_crtc.c                 | 27 +++++++++-
 drivers/gpu/drm/meson/meson_dw_hdmi.c              |  1 +
 drivers/gpu/drm/meson/meson_venc.c                 |  3 ++
 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/mtd/nand/bbt.c                             |  3 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  2 +-
 drivers/scsi/lpfc/lpfc_init.c                      |  6 ++-
 drivers/scsi/lpfc/lpfc_sli.c                       |  1 -
 drivers/tty/serial/kgdboc.c                        | 43 ++++++++--------
 fs/btrfs/tree-checker.c                            |  8 ++-
 include/linux/tracepoint.h                         |  6 +--
 include/trace/events/sched.h                       | 12 ++++-
 kernel/events/uprobes.c                            | 12 ++++-
 kernel/trace/trace.h                               | 57 ++++++++++++++++++++--
 kernel/trace/trace_functions_graph.c               |  4 ++
 kernel/trace/trace_irqsoff.c                       |  2 +
 kernel/trace/trace_sched_wakeup.c                  |  2 +
 lib/test_hexdump.c                                 |  2 +-
 mm/hugetlb.c                                       |  2 +-
 mm/shmem.c                                         | 31 ++++++++++--
 mm/userfaultfd.c                                   | 47 +++++++++++++++---
 net/tipc/topsrv.c                                  |  2 +-
 scripts/unifdef.c                                  |  4 +-
 security/selinux/nlmsgtab.c                        | 13 ++++-
 53 files changed, 330 insertions(+), 122 deletions(-)

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

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

[modify] https://crrev.com/d9b2e232772d9ffb5014dd1329c301e8b35a8f55/drivers/input/keyboard/cros_ec_keyb.c

Status: Fixed (was: Started)

Sign in to add a comment