New issue
Advanced search Search tips

Issue 907407 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Nov 25
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.14.82 into chromeos-4.14

Project Member Reported by groeck@google.com, Nov 21

Issue description

Merge v4.14.82 into chromeos-4.14
 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Nov 25

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

commit 229eff8311d153965bf8c2ab65a189a87dbe59bd
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Nov 21 18:40:37 2018

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

Merge of v4.14.82 into chromeos-4.14

Conflicts:
    fs/ext4/resize.c
    drivers/gpio/gpio-brcmstb.c

Changelog:
----------------------------------------------------------------
Alex Deucher (1):
      drm/amdgpu: add missing CHIP_HAINAN in amdgpu_ucode_get_load_type

Alexandru Ardelean (1):
      staging:iio:ad7606: fix voltage scales

Allen Wild (1):
      thermal: enable broadcom menu for arm64 bcm2835

Amir Goldstein (2):
      ovl: fix error handling in ovl_verify_set_fh()
      ovl: fix recursive oi->lock in ovl_link()

Andrea Arcangeli (1):
      mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings

Andreas Gruenbacher (1):
      gfs2: Put bitmap buffers in put_super

Ard Biesheuvel (2):
      ARM: 8809/1: proc-v7: fix Thumb annotation of cpu_v7_hvc_switch_mm
      efi/arm/libstub: Pack FDT after populating it

Arnd Bergmann (2):
      mtd: docg3: don't set conflicting BCH_CONST_PARAMS option
      lib/ubsan.c: don't mark __ubsan_handle_builtin_unreachable as noreturn

Breno Leitao (1):
      powerpc/selftests: Wait all threads to join

Changwei Ge (1):
      ocfs2: fix a misuse a of brelse after failing ocfs2_check_dir_entry

Chris Packham (1):
      clk: mvebu: use correct bit for 98DX3236 NAND

Chris Wilson (3):
      drm/i915: Large page offsets for pread/pwrite
      drm/i915: Mark pin flags as u64
      drm/i915/execlists: Force write serialisation into context image vs execution

Christophe Leroy (4):
      powerpc/traps: restore recoverability of machine_check interrupts
      powerpc/mm: Don't report hugepage tables as memory leaks when using kmemleak
      kdb: use correct pointer when 'btc' calls 'btt'
      kdb: print real address of pointers instead of hashed addresses

Clint Taylor (1):
      drm/i915/hdmi: Add HDMI 2.0 audio clock recovery N values

Daniel Axtens (1):
      powerpc/nohash: fix undefined behaviour when testing page size support

Dengcheng Zhu (1):
      MIPS: kexec: Mark CPU offline before disabling local IRQ

Dominique Martinet (2):
      9p locks: fix glock.client_id leak in do_lock
      9p: clear dangling pointers in p9stat_free

Doug Berger (1):
      gpio: brcmstb: release the bgpio lock during irq handlers

Enric Balletbo i Serra (1):
      clk: rockchip: Fix static checker warning in rockchip_ddrclk_get_parent call

Eric Biggers (1):
      crypto: user - fix leaking uninitialized memory to userspace

Eric W. Biederman (3):
      mount: Retest MNT_LOCKED in do_umount
      mount: Don't allow copying MNT_UNBINDABLE|MNT_LOCKED mounts
      mount: Prevent MNT_DETACH from disconnecting locked mounts

Fabio Estevam (1):
      ARM: imx_v6_v7_defconfig: Select CONFIG_TMPFS_POSIX_ACL

Filipe Manana (2):
      Btrfs: fix infinite loop on inode eviction after deduplication of eof block
      Btrfs: fix data corruption due to cloning of eof block

Frank Sorenson (1):
      sunrpc: correct the computation for page_ptr when truncating

Greg Edwards (1):
      vhost/scsi: truncate T10 PI iov_iter to prot_bytes

Greg Kroah-Hartman (1):
      Linux 4.14.82

Guenter Roeck (2):
      configfs: replace strncpy with memcpy
      Merge remote-tracking branch 'origin/linux/v4.14.82' into merge/chromeos-4.14-v4.14.82

Gustavo A. R. Silva (1):
      reset: hisilicon: fix potential NULL pointer dereference

H. Peter Anvin (1):
      termios, tty/tty_baudrate.c: fix buffer overrun

H. Peter Anvin (Intel) (1):
      arch/alpha, termios: implement BOTHER, IBSHIFT and termios2

Himanshu Madhani (1):
      scsi: qla2xxx: Fix incorrect port speed being set for FC adapters

Huacai Chen (3):
      MIPS/PCI: Call pcie_bus_configure_settings() to set MPS/MRRS
      MIPS: Loongson-3: Fix CPU UART irq delivery problem
      MIPS: Loongson-3: Fix BRIDGE irq delivery problem

Ilya Dryomov (1):
      libceph: bump CEPH_MSG_MAX_DATA_LEN

Joel Stanley (1):
      powerpc/boot: Ensure _zimage_start is a weak symbol

John Garry (2):
      drm/hisilicon: hibmc: Do not carry error code in HiBMC framebuffer pointer
      of, numa: Validate some distance map rules

Kirill Tkhai (2):
      fuse: Fix use-after-free in fuse_dev_do_read()
      fuse: Fix use-after-free in fuse_dev_do_write()

Krzysztof Kozlowski (1):
      clk: s2mps11: Fix matching when built as module and DT node contains compatible

Lu Fengqi (1):
      btrfs: fix pinned underflow after transaction aborted

Lubomir Rintel (1):
      media: ov7670: make "xclk" clock optional

Lucas Stach (1):
      media: coda: don't overwrite h.264 profile_idc on decoder instance

Lukas Czerner (1):
      fuse: fix use-after-free in fuse_direct_IO()

Lyude Paul (3):
      drm/nouveau: Check backlight IDs are >= 0, not > 0
      drm/i915: Don't unset intel_connector->mst_port
      drm/i915: Skip vcpi allocation for MSTB ports that are gone

Maciej W. Rozycki (1):
      rtc: hctosys: Add missing range error reporting

Marc Zyngier (2):
      soc: ti: QMSS: Fix usage of irq_set_affinity_hint
      drm/rockchip: Allow driver to be shutdown on reboot/kexec

Marco Felsch (1):
      media: tvp5150: fix width alignment during set_selection()

Mathieu Malaterre (1):
      watchdog/core: Add missing prototypes for weak functions

Max Filippov (3):
      xtensa: add NOTES section to the linker script
      xtensa: make sure bFLT stack is 16 byte aligned
      xtensa: fix boot parameters address translation

Michael Ellerman (1):
      powerpc/mm: Fix page table dump to work on Radix

Michael Kelley (2):
      x86/hyper-v: Enable PIT shutdown quirk
      clockevents/drivers/i8253: Add support for PIT shutdown quirk

Mike Kravetz (1):
      hugetlbfs: fix kernel BUG at fs/hugetlbfs/inode.c:444!

Miklos Szeredi (4):
      fuse: fix blocked_waitq wakeup
      fuse: set FR_SENT while locked
      fuse: fix leaked notify reply
      ovl: check whiteout in ovl_create_over_whiteout()

Mikulas Patocka (2):
      mach64: fix display corruption on big endian machines
      mach64: fix image corruption due to reading accelerator registers

Miles Chen (1):
      tty: check name length in tty_find_polling_driver()

Ming Lei (2):
      SCSI: fix queue cleanup race before queue initialization is done
      nvme-loop: fix kernel oops in case of unhandled command

Nicholas Mc Guire (1):
      media: pci: cx23885: handle adding to list failure

Nicholas Piggin (1):
      powerpc/64/module: REL32 relocation range check

Phil Elwell (1):
      sc16is7xx: Fix for multi-channel stall

Quinn Tran (5):
      scsi: qla2xxx: Fix process response queue for ISP26XX and above
      scsi: qla2xxx: Remove stale debug trace message from tcm_qla2xxx
      scsi: qla2xxx: shutdown chip if reset fail
      scsi: qla2xxx: Fix re-using LoopID when handle is in use
      scsi: qla2xxx: Initialize port speed to avoid setting lower speed

Rashmica Gupta (1):
      powerpc/memtrace: Remove memory in chunks

Richard Weinberger (1):
      um: Drop own definition of PTRACE_SYSEMU/_SINGLESTEP

Robbie Ko (1):
      Btrfs: fix cur_offset in the error case for nocow

Ronald Wahl (1):
      clk: at91: Fix division by zero in PLL recalc_rate()

Sam Bobroff (1):
      powerpc/eeh: Fix possible null deref in eeh_dump_dev_log()

Scott Mayhew (1):
      nfsd: COPY and CLONE operations require the saved filehandle to be set

Sergey Senozhatsky (1):
      printk: Never set console_may_schedule in console_trylock()

Stanislav Lisovskiy (1):
      drm/dp_mst: Check if primary mstb is null

Stefano Stabellini (1):
      CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM

Steven Rostedt (VMware) (1):
      x86/cpu/vmware: Do not trace vmware_sched_clock()

Theodore Ts'o (2):
      ext4: avoid possible double brelse() in add_new_gdb() on error path
      ext4: fix possible leak of sbi->s_group_desc_leak in error path

Tomi Valkeinen (1):
      drm/omap: fix memory barrier bug in DMM driver

Vasily Averin (16):
      ext4: add missing brelse() update_backups()'s error path
      ext4: add missing brelse() in set_flexbg_block_bitmap()'s error path
      ext4: add missing brelse() add_new_gdb_meta_bg()'s error path
      ext4: avoid potential extra brelse in setup_new_flex_group_blocks()
      ext4: missing !bh check in ext4_xattr_inode_write()
      ext4: fix possible inode leak in the retry loop of ext4_resize_fs()
      ext4: avoid buffer leak on shutdown in ext4_mark_iloc_dirty()
      ext4: avoid buffer leak in ext4_orphan_add() after prior errors
      ext4: fix missing cleanup if ext4_alloc_flex_bg_array() fails while resizing
      ext4: fix possible leak of s_journal_flag_rwsem in error path
      ext4: fix buffer leak in ext4_xattr_get_block() on error path
      ext4: release bs.bh before re-using in ext4_xattr_block_find()
      ext4: fix buffer leak in ext4_xattr_move_to_block() on error path
      ext4: fix buffer leak in ext4_expand_extra_isize_ea() on error path
      ext4: fix buffer leak in __ext4_read_dirblock() on error path
      mm/swapfile.c: use kvzalloc for swap_info_struct allocation

Vasily Khoruzhick (1):
      netfilter: conntrack: fix calculation of next bucket number in early_drop

Ville Syrjälä (2):
      drm/i915: Restore vblank interrupts earlier
      drm/i915: Don't oops during modeset shutdown after lpe audio deinit

Wengang Wang (1):
      ocfs2: free up write context when direct IO failed

Yan, Zheng (1):
      Revert "ceph: fix dentry leak in splice_dentry()"

Young_X (1):
      cdrom: fix improper type cast, which can leat to information leak.

 Makefile                                          |  2 +-
 arch/alpha/include/asm/termios.h                  |  8 +++-
 arch/alpha/include/uapi/asm/ioctls.h              |  5 ++
 arch/alpha/include/uapi/asm/termbits.h            | 17 +++++++
 arch/arm/configs/imx_v6_v7_defconfig              |  1 +
 arch/arm/mm/proc-v7.S                             |  2 +-
 arch/mips/include/asm/mach-loongson64/irq.h       |  2 +-
 arch/mips/kernel/crash.c                          |  3 ++
 arch/mips/kernel/machine_kexec.c                  |  3 ++
 arch/mips/loongson64/loongson-3/irq.c             | 56 +++--------------------
 arch/mips/pci/pci-legacy.c                        |  4 ++
 arch/powerpc/boot/crt0.S                          |  4 +-
 arch/powerpc/kernel/eeh.c                         |  5 ++
 arch/powerpc/kernel/module_64.c                   |  9 +++-
 arch/powerpc/kernel/traps.c                       |  9 +++-
 arch/powerpc/mm/dump_linuxpagetables.c            | 12 +++--
 arch/powerpc/mm/hugetlbpage.c                     |  3 ++
 arch/powerpc/mm/tlb_nohash.c                      |  3 ++
 arch/powerpc/platforms/powernv/memtrace.c         | 21 +++++++--
 arch/x86/kernel/cpu/mshyperv.c                    | 11 +++++
 arch/x86/kernel/cpu/vmware.c                      |  2 +-
 arch/x86/um/shared/sysdep/ptrace_32.h             | 10 ----
 arch/xtensa/boot/Makefile                         |  2 +-
 arch/xtensa/include/asm/processor.h               |  6 ++-
 arch/xtensa/kernel/head.S                         |  7 ++-
 arch/xtensa/kernel/vmlinux.lds.S                  |  1 +
 block/blk-core.c                                  |  5 +-
 crypto/crypto_user.c                              | 18 ++++----
 drivers/cdrom/cdrom.c                             |  2 +-
 drivers/clk/at91/clk-pll.c                        |  3 ++
 drivers/clk/clk-s2mps11.c                         | 30 ++++++++++++
 drivers/clk/hisilicon/reset.c                     |  5 +-
 drivers/clk/mvebu/clk-corediv.c                   |  2 +-
 drivers/clk/rockchip/clk-ddr.c                    |  4 --
 drivers/clocksource/i8253.c                       | 14 +++++-
 drivers/firmware/efi/libstub/fdt.c                |  4 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c         |  1 +
 drivers/gpu/drm/drm_dp_mst_topology.c             |  3 ++
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c |  1 +
 drivers/gpu/drm/i915/i915_gem.c                   | 12 +----
 drivers/gpu/drm/i915/i915_gem_gtt.h               | 28 ++++++------
 drivers/gpu/drm/i915/intel_audio.c                | 17 +++++++
 drivers/gpu/drm/i915/intel_display.c              | 23 ++++++----
 drivers/gpu/drm/i915/intel_dp_mst.c               | 41 +++++++++--------
 drivers/gpu/drm/i915/intel_lpe_audio.c            |  4 +-
 drivers/gpu/drm/i915/intel_lrc.c                  | 14 +++++-
 drivers/gpu/drm/nouveau/nouveau_backlight.c       |  4 +-
 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c          | 11 +++++
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c       |  6 +++
 drivers/media/i2c/ov7670.c                        | 30 +++++++-----
 drivers/media/i2c/tvp5150.c                       | 14 ++++--
 drivers/media/pci/cx23885/altera-ci.c             | 10 ++++
 drivers/media/platform/coda/coda-common.c         |  3 +-
 drivers/mtd/devices/Kconfig                       |  2 +-
 drivers/nvme/target/loop.c                        |  9 +---
 drivers/of/of_numa.c                              |  9 +++-
 drivers/rtc/hctosys.c                             |  4 +-
 drivers/scsi/qla2xxx/qla_init.c                   | 23 +++-------
 drivers/scsi/qla2xxx/qla_iocb.c                   | 17 -------
 drivers/scsi/qla2xxx/qla_mbx.c                    |  5 +-
 drivers/scsi/qla2xxx/qla_target.c                 |  3 +-
 drivers/scsi/qla2xxx/tcm_qla2xxx.c                |  4 --
 drivers/scsi/scsi_lib.c                           |  8 ++++
 drivers/soc/ti/knav_qmss.h                        |  4 +-
 drivers/soc/ti/knav_qmss_acc.c                    | 10 ++--
 drivers/soc/ti/knav_qmss_queue.c                  | 22 ++++++---
 drivers/staging/iio/adc/ad7606.c                  |  7 ++-
 drivers/thermal/Kconfig                           |  2 +-
 drivers/tty/serial/sc16is7xx.c                    | 19 +++++---
 drivers/tty/tty_baudrate.c                        |  4 +-
 drivers/tty/tty_io.c                              |  2 +-
 drivers/vhost/scsi.c                              |  4 +-
 drivers/video/fbdev/aty/mach64_accel.c            | 28 +++++-------
 fs/9p/vfs_file.c                                  | 16 ++++++-
 fs/btrfs/disk-io.c                                | 12 ++++-
 fs/btrfs/inode.c                                  |  5 +-
 fs/btrfs/ioctl.c                                  | 14 +++++-
 fs/ceph/inode.c                                   |  8 +++-
 fs/configfs/symlink.c                             |  2 +-
 fs/ext4/inode.c                                   |  5 +-
 fs/ext4/namei.c                                   |  5 +-
 fs/ext4/resize.c                                  | 27 ++++++-----
 fs/ext4/super.c                                   | 17 +++----
 fs/ext4/xattr.c                                   | 21 +++++++--
 fs/fuse/dev.c                                     | 29 +++++++++---
 fs/fuse/file.c                                    |  4 +-
 fs/gfs2/rgrp.c                                    |  3 +-
 fs/namespace.c                                    | 22 +++++++--
 fs/nfsd/nfs4proc.c                                |  3 ++
 fs/ocfs2/aops.c                                   | 12 ++++-
 fs/ocfs2/cluster/masklog.h                        |  9 ++++
 fs/ocfs2/dir.c                                    |  3 +-
 fs/overlayfs/dir.c                                |  9 ++++
 fs/overlayfs/namei.c                              |  4 +-
 include/linux/ceph/libceph.h                      |  8 +++-
 include/linux/i8253.h                             |  1 +
 include/linux/nmi.h                               |  2 +
 include/xen/xen-ops.h                             |  2 +-
 kernel/debug/kdb/kdb_bt.c                         |  4 +-
 kernel/debug/kdb/kdb_main.c                       | 14 +++---
 kernel/debug/kdb/kdb_support.c                    | 12 ++---
 kernel/printk/printk.c                            | 22 ++++-----
 lib/ubsan.c                                       |  3 +-
 mm/hugetlb.c                                      | 23 ++++++++--
 mm/mempolicy.c                                    | 32 ++++++++++++-
 mm/swapfile.c                                     |  6 +--
 net/9p/protocol.c                                 |  5 ++
 net/netfilter/nf_conntrack_core.c                 | 13 ++++--
 net/sunrpc/xdr.c                                  |  5 +-
 tools/testing/selftests/powerpc/tm/tm-tmspr.c     | 27 +++++++----
 110 files changed, 719 insertions(+), 393 deletions(-)

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

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

[modify] https://crrev.com/229eff8311d153965bf8c2ab65a189a87dbe59bd/drivers/gpio/gpio-brcmstb.c
[modify] https://crrev.com/229eff8311d153965bf8c2ab65a189a87dbe59bd/fs/ext4/resize.c

Status: Fixed (was: Started)

Sign in to add a comment