New issue
Advanced search Search tips

Issue 842918 link

Starred by 2 users

Issue metadata

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



Sign in to add a comment

Merge v4.14.41 into chromeos-4.14

Project Member Reported by groeck@chromium.org, May 14 2018

Issue description

Merge v4.14.41 into chromeos-4.14

 

Comment 1 by groeck@chromium.org, May 17 2018

Description: Show this description

Comment 2 by groeck@chromium.org, May 17 2018

Summary: Merge v4.14.42 into chromeos-4.14 (was: Merge v4.14.31 into chromeos-4.14)

Comment 3 by groeck@chromium.org, May 17 2018

Description: Show this description

Comment 4 by groeck@chromium.org, May 17 2018

Summary: Merge v4.14.41 into chromeos-4.14 (was: Merge v4.14.42 into chromeos-4.14)

Comment 5 by groeck@chromium.org, May 18 2018

Status: Started (was: Assigned)
Project Member

Comment 6 by bugdroid1@chromium.org, May 22 2018

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

commit 2b0d55a3d4d018e3715919ba55f0afba6bedb716
Author: Guenter Roeck <groeck@chromium.org>
Date: Thu May 17 14:50:22 2018

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

Merge of v4.14.41 into chromeos-4.14

Conflicts:
    mm/z3fold.c

Changelog:
----------------------------------------------------------------
Anthoine Bourgeois (1):
      KVM: x86: remove APIC Timer periodic/oneshot spikes

Boris Brezillon (1):
      drm/vc4: Fix scaling of uni-planar formats

David Rientjes (1):
      mm, oom: fix concurrent munlock and oom reaper unmap, v3

Eric Dumazet (10):
      crypto: af_alg - fix possible uninit-value in alg_bind()
      netlink: fix uninit-value in netlink_sendmsg
      net: fix rtnh_ok()
      net: initialize skb->peeked when cloning
      net: fix uninit-value in __hw_addr_add_ex()
      dccp: initialize ireq->ir_mark
      ipv4: fix uninit-value in ip_route_output_key_hash_rcu()
      soreuseport: initialise timewait reuseport field
      inetpeer: fix uninit-value in inet_getpeer
      tcp: fix TCP_REPAIR_QUEUE bound checking

Florent Flament (1):
      drm/i915: Fix drm:intel_enable_lvds ERROR message in kernel log

Florian Westphal (1):
      netfilter: ebtables: don't attempt to allocate 0-sized compat array

Govert Overgaauw (1):
      gpio: fix aspeed_gpio unmask irq

Greg Kroah-Hartman (1):
      Linux 4.14.41

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

Gustavo A. R. Silva (2):
      net: atm: Fix potential Spectre v1
      atm: zatm: Fix potential Spectre v1

Hans de Goede (4):
      libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs
      Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"
      Bluetooth: btusb: Add Dell XPS 13 9360 to btusb_needs_reset_resume_table
      Bluetooth: btusb: Only check needs_reset_resume DMI table for QCA rome chipsets

Ilya Dryomov (1):
      ceph: fix rsize/wsize capping in ceph_direct_read_write()

Jan Kara (1):
      bdi: Fix oops in wb_workfn()

Jann Horn (1):
      compat: fix 4-byte infoleak via uninitialized struct field

Jens Axboe (1):
      nvme: add quirk to force medium priority for SQ creation

Jimmy Assarsson (1):
      can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg()

Jiri Olsa (1):
      perf: Remove superfluous allocation error check

Johan Hovold (1):
      rfkill: gpio: fix memory leak in probe error path

Julian Anastasov (1):
      ipvs: fix rtnl_lock lockups caused by start_sync_thread

Kai Heng Feng (1):
      PCI / PM: Always check PME wakeup capability for runtime wakeup support

Laurent Vivier (1):
      KVM: PPC: Book3S HV: Fix guest time accounting with VIRT_CPU_ACCOUNTING_GEN

Lukas Wunner (2):
      can: hi311x: Acquire SPI lock on ->do_get_berr_counter
      can: hi311x: Work around TX complete interrupt erratum

Lyude Paul (1):
      drm/nouveau: Fix deadlock in nv50_mstm_register_connector()

Marek Szyprowski (2):
      thermal: exynos: Reading temperature makes sense only when TMU is turned on
      thermal: exynos: Propagate error value from tmu_read()

Masami Hiramatsu (1):
      tracing/uprobe_event: Fix strncpy corner case

Michal Hocko (1):
      memcg: fix per_node_info cleanup

Mikulas Patocka (1):
      dm integrity: use kvfree for kvmalloc'd memory

Paul Mackerras (3):
      KVM: PPC: Book3S HV: Fix trap number return from __kvmppc_vcore_entry
      KVM: PPC: Book3S HV: Fix VRMA initialization with 2MB or 1GB memory backing
      KVM: PPC: Book3S HV: Fix handling of large pages in radix page fault handler

Pavel Tatashin (1):
      mm: sections are not offlined during memory hotremove

Peter Zijlstra (6):
      sched/autogroup: Fix possible Spectre-v1 indexing for sched_prio_to_weight[]
      perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_*
      perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr
      perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver
      perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]
      perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map()

Rafael J. Wysocki (2):
      PCI / PM: Check device_may_wakeup() in pci_enable_wake()
      cpufreq: schedutil: Avoid using invalid next_freq

Steve French (1):
      smb3: directory sync should not return an error

Steven Rostedt (VMware) (1):
      tracing: Fix regex_match_front() to not over compare the test string

Suzuki K Poulose (1):
      arm64: Add work around for Arm Cortex-A55 Erratum 1024718

Tetsuo Handa (1):
      bdi: wake up concurrent wb_shutdown() callers.

Timur Tabi (1):
      gpioib: do not free unrequested descriptors

Tom Herbert (1):
      kcm: Call strp_stop before strp_done in kcm_attach

Uwe Kleine-König (1):
      gpio: fix error path in lineevent_create

Ville Syrjälä (2):
      drm/atomic: Clean old_state/new_state in drm_atomic_state_default_clear()
      drm/atomic: Clean private obj old_state/new_state in drm_atomic_state_default_clear()

Vitaly Wool (1):
      z3fold: fix reclaim lock-ups

 Documentation/arm64/silicon-errata.txt  |   1 +
 Makefile                                |   2 +-
 arch/arm64/Kconfig                      |  14 +++
 arch/arm64/include/asm/assembler.h      |  40 +++++++++
 arch/arm64/include/asm/cputype.h        |   2 +
 arch/arm64/mm/proc.S                    |   5 ++
 arch/powerpc/kvm/book3s_64_mmu_radix.c  |  72 +++++++++------
 arch/powerpc/kvm/book3s_hv.c            |  17 ++--
 arch/powerpc/kvm/book3s_hv_rmhandlers.S |   8 +-
 arch/x86/events/core.c                  |   8 +-
 arch/x86/events/intel/cstate.c          |   2 +
 arch/x86/events/msr.c                   |   9 +-
 arch/x86/kvm/lapic.c                    |  37 ++++----
 crypto/af_alg.c                         |   8 +-
 drivers/ata/libata-core.c               |   3 +
 drivers/atm/zatm.c                      |   3 +
 drivers/bluetooth/btusb.c               |  19 +++-
 drivers/gpio/gpio-aspeed.c              |   2 +-
 drivers/gpio/gpiolib.c                  |   7 +-
 drivers/gpu/drm/drm_atomic.c            |   8 ++
 drivers/gpu/drm/i915/intel_lvds.c       |   3 +-
 drivers/gpu/drm/nouveau/nv50_display.c  |   7 +-
 drivers/gpu/drm/vc4/vc4_plane.c         |   2 +-
 drivers/md/dm-integrity.c               |   2 +-
 drivers/net/can/spi/hi311x.c            |  11 ++-
 drivers/net/can/usb/kvaser_usb.c        |   2 +-
 drivers/nvme/host/nvme.h                |   5 ++
 drivers/nvme/host/pci.c                 |  12 ++-
 drivers/pci/pci.c                       |  37 +++++---
 drivers/thermal/samsung/exynos_tmu.c    |  14 ++-
 fs/ceph/file.c                          |  10 +--
 fs/cifs/cifsfs.c                        |  13 +++
 fs/fs-writeback.c                       |   2 +-
 include/linux/oom.h                     |   2 +
 include/linux/wait_bit.h                |  17 ++++
 include/net/inet_timewait_sock.h        |   1 +
 include/net/nexthop.h                   |   2 +-
 kernel/compat.c                         |   1 +
 kernel/events/callchain.c               |  10 +--
 kernel/events/ring_buffer.c             |   7 +-
 kernel/sched/autogroup.c                |   7 +-
 kernel/sched/cpufreq_schedutil.c        |   3 +-
 kernel/trace/trace_events_filter.c      |   3 +
 kernel/trace/trace_uprobe.c             |   2 +
 mm/backing-dev.c                        |   2 +-
 mm/memcontrol.c                         |   3 +
 mm/mmap.c                               |  44 +++++----
 mm/oom_kill.c                           |  74 ++++++++-------
 mm/sparse.c                             |   2 +-
 mm/z3fold.c                             |   2 +-
 net/atm/lec.c                           |   9 +-
 net/bridge/netfilter/ebtables.c         |  11 +--
 net/core/dev_addr_lists.c               |   4 +-
 net/core/skbuff.c                       |   1 +
 net/dccp/ipv4.c                         |   1 +
 net/dccp/ipv6.c                         |   1 +
 net/ipv4/inet_timewait_sock.c           |   1 +
 net/ipv4/inetpeer.c                     |   1 +
 net/ipv4/route.c                        |  11 +--
 net/ipv4/tcp.c                          |   2 +-
 net/kcm/kcmsock.c                       |   1 +
 net/netfilter/ipvs/ip_vs_ctl.c          |   8 --
 net/netfilter/ipvs/ip_vs_sync.c         | 155 ++++++++++++++++----------------
 net/netlink/af_netlink.c                |   2 +
 net/rfkill/rfkill-gpio.c                |   7 +-
 65 files changed, 513 insertions(+), 271 deletions(-)

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

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

[modify] https://crrev.com/2b0d55a3d4d018e3715919ba55f0afba6bedb716/mm/z3fold.c

Comment 7 by groeck@chromium.org, May 23 2018

Status: Fixed (was: Started)

Sign in to add a comment