New issue
Advanced search Search tips

Issue 910940 link

Starred by 1 user

Issue metadata

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



Sign in to add a comment

Merge v4.19.6 into chromeos-4.19

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

Issue description

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

Comment 2 by bugdroid1@chromium.org, Dec 5

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

commit 1f11fe6109dfd18a82f6a387c3add4b1a930252b
Author: Guenter Roeck <groeck@chromium.org>
Date: Sun Dec 02 17:36:36 2018

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

Merge of v4.19.6 into chromeos-4.19

Conflicts:
    mm/z3fold.c
    kernel/sched/fair.c
    kernel/debug/kdb/kdb_io.c

Changelog:
----------------------------------------------------------------
Aaron Ma (2):
      usb: xhci: fix uninitialized completion when USB3 port got wrong status
      usb: xhci: fix timeout for transition from RExit to U0

Adrian Hunter (1):
      mmc: sdhci-pci: Workaround GLK firmware failing to restore the tuning value

Alexander Stein (1):
      can: flexcan: Always use last mailbox for TX

Alistair Strachan (1):
      efi/libstub: arm: support building with clang

Amir Goldstein (2):
      fsnotify: generalize handling of extra event flags
      fanotify: fix handling of events on child sub-directory

Andreas Gruenbacher (1):
      gfs2: Fix iomap buffer head reference counting bug

Andrew Price (1):
      gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd

Andy Shevchenko (1):
      usb: dwc3: core: Clean up ULPI device

Aneesh Kumar K.V (1):
      mm/memory.c: recheck page table entry with page table lock held

Anson Huang (1):
      cpufreq: imx6q: add return value check for voltage scale

Ard Biesheuvel (2):
      crypto: simd - correctly take reqsize of wrapped skcipher into account
      efi/arm: Revert deferred unmap of early memmap mapping

Arnd Bergmann (1):
      scsi: lpfc: fix remoteport access

Boris Brezillon (1):
      drm/vc4: Set ->legacy_cursor_update to false when doing non-async updates

Cherian, George (1):
      xhci: Add quirk to workaround the errata seen on Cavium Thunder-X2 Soc

David Abdurachmanov (1):
      riscv: add missing vdso_install target

Dennis Wassenberg (1):
      usb: core: Fix hub port connection events lost

Dmitry Torokhov (1):
      Input: synaptics - avoid using uninitialized variable when probing

Dmitry Vyukov (1):
      mm: don't warn about large allocations for slab

Dominique Martinet (1):
      v9fs_dir_readdir: fix double-free on p9stat_read error

Emmanuel Grumbach (2):
      iwlwifi: mvm: support sta_statistics() even on older firmware
      iwlwifi: mvm: fix regulatory domain update when the firmware starts

Eric Dumazet (2):
      llc: do not use sk_eat_skb()
      tcp: do not release socket ownership in tcp_close()

Erik Schmauss (1):
      ACPICA: AML interpreter: add region addresses in global list during initialization

Felipe Balbi (1):
      usb: dwc3: gadget: fix ISOC TRB type on unaligned transfers

Felix Kuehling (1):
      drm/amdgpu: Fix oops when pp_funcs->switch_power_profile is unset

Greg Kroah-Hartman (3):
      MAINTAINERS: Add Sasha as a stable branch maintainer
      tty: wipe buffer if not echoing data
      Linux 4.19.6

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

Hannes Reinecke (1):
      block: copy ioprio in __bio_clone_fast() and bounce

Hans de Goede (1):
      rtc: cmos: Do not export alarm rtc_ops when we do not support alarms

Hugues Fruchet (4):
      media: ov5640: fix exposure regression
      media: ov5640: fix auto gain & exposure when changing mode
      media: ov5640: fix wrong binning value in exposure calculation
      media: ov5640: fix auto controls values when switching to manual mode

Jacopo Mondi (2):
      media: ov5640: Re-work MIPI startup sequence
      media: ov5640: Fix timings setup code

Jens Axboe (1):
      floppy: fix race condition in __floppy_read_block_0()

Jerome Brunet (5):
      pinctrl: meson: fix pinconf bias disable
      pinctrl: meson: fix gxbb ao pull register bits
      pinctrl: meson: fix gxl ao pull register bits
      pinctrl: meson: fix meson8 ao pull register bits
      pinctrl: meson: fix meson8b ao pull register bits

Kan Liang (1):
      perf/x86/intel/uncore: Add more IMC PCI IDs for KabyLake and CoffeeLake CPUs

Keerthy (2):
      opp: ti-opp-supply: Dynamically update u_volt_min
      opp: ti-opp-supply: Correct the supply in _get_optimal_vdd_voltage call

Konstantin Khlebnikov (1):
      tools/power/cpupower: fix compilation with STATIC=true

Kuppuswamy Sathyanarayanan (1):
      usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove()

Linus Torvalds (1):
      tty: wipe buffer.

Luca Coelho (1):
      iwlwifi: mvm: don't use SAR Geo if basic SAR is not used

Lukas Wunner (1):
      can: hi311x: Use level-triggered interrupt

Marc Kleine-Budde (5):
      can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb()
      can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length
      can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed out of bounds
      can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb
      can: flexcan: remove not needed struct flexcan_priv::tx_mb and struct flexcan_priv::tx_mb_idx

Masayoshi Mizuma (1):
      tools/testing/nvdimm: Fix the array size for dimm devices.

Mathias Nyman (3):
      xhci: Fix leaking USB3 shared_hcd at xhci removal
      xhci: handle port status events for removed USB3 hcd
      usb: xhci: Prevent bus suspend if a port connect change or polling state is detected

Matt Chen (1):
      iwlwifi: fix wrong WGDS_WIFI_DATA_SIZE

Matthew Wilcox (1):
      dax: Avoid losing wakeup in dax_lock_mapping_entry

Michael Ellerman (1):
      powerpc/io: Fix the IO workarounds code to work with Radix

Michael J. Ruhl (1):
      IB/hfi1: Eliminate races in the SDMA send error path

Michal Hocko (2):
      mm, memory_hotplug: check zone_movable in has_unmovable_pages
      mm, page_alloc: check for max order in hot path

Oleksij Rempel (4):
      can: rx-offload: introduce can_rx_offload_get_echo_skb() and can_rx_offload_queue_sorted() functions
      can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail()
      can: flexcan: use can_rx_offload_queue_sorted() for flexcan_irq_bus_*()
      can: flexcan: handle tx-complete CAN frames via rx-offload infrastructure

Oliver Hartkopp (1):
      can: raw: check for CAN FD capable netdev in raw_sendmsg()

Olof Johansson (1):
      RISC-V: Silence some module warnings on 32-bit

Pankaj Bansal (1):
      can: flexcan: Unlock the MB unconditionally

Patrick Bellasi (1):
      sched/fair: Fix cpu_util_wake() for 'execl' type workloads

Paul E. McKenney (1):
      rcu: Make need_resched() respond to urgent RCU-QS needs

Paul Kocialkowski (1):
      drm/fb-helper: Blacklist writeback when adding connectors to fbdev

Philip Yang (1):
      drm/amdgpu: fix bug with IH ring setup

Prarit Bhargava (1):
      kdb: Use strscpy with destination buffer size

Rafał Miłecki (1):
      brcmfmac: fix reporting support for 160 MHz channels

Rajat Jain (1):
      mmc: sdhci-pci: Try "cd" for card-detect lookup before using NULL

Rodrigo Rivas Costa (1):
      HID: steam: remove input device when a hid client is running.

Sandeep Singh (1):
      xhci: Add check for invalid byte size error when UAS devices are connected.

Satheesh Rajendran (1):
      powerpc/numa: Suppress "VPHN is not supported" messages

Scott Wood (1):
      KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE

Sebastien Boisvert (1):
      include/linux/pfn_t.h: force '~' to be parsed as an unary operator

Takashi Iwai (2):
      ALSA: oss: Use kvzalloc() for local buffer allocations
      drm/amdgpu: Add missing firmware entry for HAINAN

Tetsuo Handa (2):
      selinux: Add __GFP_NOWARN to allocation at str_read()
      bfs: add sanity check at bfs_fill_super()

Thinh Nguyen (1):
      usb: dwc3: gadget: Properly check last unaligned/zero chain TRB

Thomas Zimmermann (1):
      drm/ast: Remove existing framebuffers before loading driver

Trond Myklebust (2):
      SUNRPC: Fix a bogus get/put in generic_key_to_expire()
      NFSv4: Fix an Oops during delegation callbacks

Ville Syrjälä (1):
      drm/i915: Disable LP3 watermarks on all SNB machines

Vitaly Wool (1):
      z3fold: fix possible reclaim races

Vladimir Zapolskiy (1):
      gpio: don't free unallocated ida on gpiochip_add_data_with_key() error path

Will Deacon (2):
      Documentation/security-bugs: Clarify treatment of embargoed information
      Documentation/security-bugs: Postpone fix publication in exceptional cases

Xin Long (1):
      sctp: clear the transport of some out_chunk_list chunks in sctp_assoc_rm_peer

Xulin Sun (1):
      rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write

Y.C. Chen (2):
      drm/ast: change resolution may cause screen blurred
      drm/ast: fixed cursor may disappear sometimes

YueHaibing (1):
      scsi: hisi_sas: Remove set but not used variable 'dq_list'

Yufen Yu (1):
      tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset

 Documentation/admin-guide/security-bugs.rst        |  48 ++--
 .../devicetree/bindings/net/can/holt_hi311x.txt    |   2 +-
 MAINTAINERS                                        |   1 +
 Makefile                                           |   2 +-
 arch/powerpc/include/asm/io.h                      |  20 +-
 arch/powerpc/kvm/trace.h                           |   8 +-
 arch/powerpc/kvm/trace_booke.h                     |   9 +-
 arch/powerpc/kvm/trace_hv.h                        |   9 +-
 arch/powerpc/kvm/trace_pr.h                        |   9 +-
 arch/powerpc/mm/numa.c                             |   2 +-
 arch/riscv/Makefile                                |   4 +
 arch/riscv/kernel/module.c                         |  12 +-
 arch/x86/events/intel/uncore_snb.c                 | 115 ++++++++-
 block/bio.c                                        |   1 +
 block/bounce.c                                     |   1 +
 crypto/simd.c                                      |   5 +-
 drivers/acpi/acpica/dsopcode.c                     |   4 +
 drivers/block/floppy.c                             |   3 +-
 drivers/cpufreq/imx6q-cpufreq.c                    |   7 +-
 drivers/firmware/efi/arm-init.c                    |   4 +
 drivers/firmware/efi/arm-runtime.c                 |   2 +-
 drivers/firmware/efi/libstub/Makefile              |   3 +-
 drivers/firmware/efi/memmap.c                      |   3 +
 drivers/gpio/gpiolib.c                             |   5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |   7 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |   1 +
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |   2 +-
 drivers/gpu/drm/ast/ast_drv.c                      |  21 ++
 drivers/gpu/drm/ast/ast_mode.c                     |   3 +-
 drivers/gpu/drm/drm_fb_helper.c                    |   3 +
 drivers/gpu/drm/i915/intel_pm.c                    |  41 +++-
 drivers/gpu/drm/vc4/vc4_kms.c                      |   6 +
 drivers/hid/hid-steam.c                            | 154 +++++++-----
 drivers/infiniband/hw/hfi1/user_sdma.c             |  87 +++----
 drivers/infiniband/hw/hfi1/user_sdma.h             |   3 -
 drivers/input/mouse/synaptics.c                    |   4 +-
 drivers/media/i2c/ov5640.c                         | 263 +++++++++++++--------
 drivers/mmc/host/sdhci-pci-core.c                  |  79 ++++++-
 drivers/net/can/dev.c                              |  48 +++-
 drivers/net/can/flexcan.c                          | 108 +++++----
 drivers/net/can/rx-offload.c                       |  51 +++-
 drivers/net/can/spi/hi311x.c                       |   2 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   3 +-
 drivers/net/wireless/intel/iwlwifi/fw/acpi.h       |   4 +-
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c        |  38 ++-
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |  12 +-
 drivers/net/wireless/intel/iwlwifi/mvm/nvm.c       |   5 +-
 drivers/opp/ti-opp-supply.c                        |   5 +-
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c         |   2 +-
 drivers/pinctrl/meson/pinctrl-meson-gxl.c          |   2 +-
 drivers/pinctrl/meson/pinctrl-meson.c              |   2 +-
 drivers/pinctrl/meson/pinctrl-meson8.c             |   2 +-
 drivers/pinctrl/meson/pinctrl-meson8b.c            |   2 +-
 drivers/rtc/rtc-cmos.c                             |  16 +-
 drivers/rtc/rtc-pcf2127.c                          |   3 +
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c             |   2 -
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c             |   2 -
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c             |   2 -
 drivers/scsi/lpfc/lpfc_debugfs.c                   |   2 +
 drivers/tty/n_tty.c                                |  20 +-
 drivers/tty/tty_buffer.c                           |   6 +-
 drivers/usb/core/hub.c                             |   4 +-
 drivers/usb/dwc3/core.c                            |   1 +
 drivers/usb/dwc3/dwc3-pci.c                        |   4 +-
 drivers/usb/dwc3/gadget.c                          |   8 +-
 drivers/usb/host/xhci-histb.c                      |   6 +-
 drivers/usb/host/xhci-hub.c                        |  66 ++++--
 drivers/usb/host/xhci-mtk.c                        |   6 +-
 drivers/usb/host/xhci-pci.c                        |   6 +
 drivers/usb/host/xhci-plat.c                       |   6 +-
 drivers/usb/host/xhci-ring.c                       |  45 +++-
 drivers/usb/host/xhci-tegra.c                      |   1 +
 drivers/usb/host/xhci.c                            |   2 -
 drivers/usb/host/xhci.h                            |   3 +-
 fs/9p/vfs_dir.c                                    |  11 -
 fs/bfs/inode.c                                     |   9 +-
 fs/dax.c                                           |   7 +-
 fs/gfs2/bmap.c                                     |  40 ++--
 fs/gfs2/ops_fstype.c                               |   2 +-
 fs/nfs/callback_proc.c                             |   4 +-
 fs/nfs/delegation.c                                |  11 +-
 fs/notify/fanotify/fanotify.c                      |  10 +-
 fs/notify/fsnotify.c                               |  15 +-
 include/linux/can/dev.h                            |   1 +
 include/linux/can/rx-offload.h                     |   7 +-
 include/linux/fsnotify_backend.h                   |   9 +-
 include/linux/pfn_t.h                              |   2 +-
 include/net/sock.h                                 |   1 +
 kernel/debug/kdb/kdb_io.c                          |  15 +-
 kernel/debug/kdb/kdb_private.h                     |   2 +-
 kernel/debug/kdb/kdb_support.c                     |  10 +-
 kernel/rcu/tree.c                                  |   9 +
 kernel/sched/fair.c                                |  64 +++--
 mm/memory.c                                        |  34 ++-
 mm/page_alloc.c                                    |  28 ++-
 mm/shmem.c                                         |   4 +-
 mm/slab.c                                          |   4 +
 mm/slab_common.c                                   |  12 +-
 mm/z3fold.c                                        |  99 ++++----
 net/can/raw.c                                      |  15 +-
 net/core/sock.c                                    |   2 +-
 net/ipv4/tcp.c                                     |  11 +-
 net/llc/af_llc.c                                   |  11 +-
 net/sctp/associola.c                               |  10 +-
 net/sunrpc/auth_generic.c                          |   8 +-
 security/selinux/ss/policydb.c                     |   2 +-
 sound/core/oss/pcm_oss.c                           |   6 +-
 sound/core/oss/pcm_plugin.c                        |   6 +-
 tools/power/cpupower/bench/Makefile                |   2 +-
 tools/power/cpupower/lib/cpufreq.c                 |   2 +-
 tools/power/cpupower/lib/cpuidle.c                 |   2 +-
 tools/power/cpupower/lib/cpupower.c                |   4 +-
 tools/power/cpupower/lib/cpupower_intern.h         |   2 +-
 tools/testing/nvdimm/test/nfit.c                   |   8 +-
 114 files changed, 1333 insertions(+), 618 deletions(-)

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

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

[modify] https://crrev.com/1f11fe6109dfd18a82f6a387c3add4b1a930252b/mm/z3fold.c
[modify] https://crrev.com/1f11fe6109dfd18a82f6a387c3add4b1a930252b/kernel/sched/fair.c
[modify] https://crrev.com/1f11fe6109dfd18a82f6a387c3add4b1a930252b/kernel/debug/kdb/kdb_io.c

Status: Fixed (was: Started)

Sign in to add a comment