New issue
Advanced search Search tips

Issue 921034 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jan 17
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.19.15 into chromeos-4.19

Project Member Reported by groeck@chromium.org, Jan 11

Issue description

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

Comment 2 by bugdroid1@chromium.org, Jan 17 (6 days ago)

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

commit fe16e58c302d949ea067efb6ed8329836a4592af
Author: Guenter Roeck <groeck@chromium.org>
Date: Sun Jan 13 15:40:50 2019

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

Merge of v4.19.15 into chromeos-4.19

Conflicts:
    mm/swapfile.c
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    Makefile

Changelog:
----------------------------------------------------------------
Alexander Aring (1):
      ieee802154: hwsim: fix off-by-one in parse nested

Alexander Shishkin (1):
      intel_th: msu: Fix an off-by-one in attribute store

Andreas Gruenbacher (2):
      gfs2: Get rid of potential double-freeing in gfs2_create_inode
      gfs2: Fix loop in gfs2_rbm_find

Andrey Grodzovsky (1):
      drm/amdgpu: Fix DEBUG_LOCKS_WARN_ON(depth <= 0) in amdgpu_ctx.lock

Anson Huang (1):
      ARM: imx: update the cpu power up timing setting on i.mx6sx

Anssi Hannula (3):
      net: macb: fix random memory corruption on RX with 64-bit DMA
      net: macb: fix dropped RX frames due to a race
      net: macb: add missing barriers when reading descriptors

Ard Biesheuvel (2):
      arm64: drop linker script hack to hide __efistub_ symbols
      arm64: relocatable: fix inconsistencies in linker script and options

Arnd Bergmann (1):
      w90p910_ether: remove incorrect __init annotation

Atul Gupta (1):
      net/tls: Init routines in create_ctx

Bart Van Assche (1):
      RDMA/srpt: Fix a use-after-free in the channel release code

Benjamin Coddington (1):
      lockd: Show pid of lockd for remote locks

Benjamin Poirier (1):
      xfrm: Fix bucket count reported to userspace

Boris Brezillon (1):
      drm/vc4: Set ->is_yuv to false when num_planes == 1

Brad Love (1):
      media: cx23885: only reset DMA on problematic CPUs

Breno Leitao (1):
      powerpc/tm: Set MSR[TS] just prior to recheckpoint

Bryan Whitehead (2):
      lan743x: Expand phy search for LAN7431
      lan743x: Remove MAC Reset from initialization

Christian Borntraeger (1):
      genwqe: Fix size check

Christophe Leroy (1):
      lib: fix build failure in CONFIG_DEBUG_VIRTUAL test

Colin Ian King (1):
      vxge: ensure data0 is initialized in when fetching firmware version information

Corentin Labbe (1):
      ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V

Damien Le Moal (1):
      block: mq-deadline: Fix write completion handling

Dan Carpenter (3):
      scsi: bnx2fc: Fix NULL dereference in error handling
      qed: Fix an error code qed_ll2_start_xmit()
      ALSA: cs46xx: Potential NULL dereference in probe

Dan Williams (6):
      mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
      mm, devm_memremap_pages: kill mapping "System RAM" support
      mm, devm_memremap_pages: fix shutdown handling
      mm, devm_memremap_pages: add MEMORY_DEVICE_PRIVATE support
      mm, hmm: use devm semantics for hmm_devmem_{add, remove}
      mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL

Daniele Palmas (1):
      qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup

David Herrmann (1):
      fork: record start_time late

Dennis Krein (1):
      srcu: Lock srcu_data structure in srcu_gp_start()

Dominique Martinet (1):
      9p/net: put a lower bound on msize

Enric Balletbo i Serra (1):
      drm/rockchip: psr: do not dereference encoder before it is null checked.

Ewan D. Milne (1):
      scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid

Fabio Estevam (2):
      ARM: dts: imx7d-pico: Describe the Wifi clock
      ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock

Florian Westphal (2):
      netfilter: seqadj: re-load tcp header pointer after possible head reallocation
      netfilter: nat: can't use dst_hold on noref dst

Frank Rowand (2):
      of: of_node_get()/of_node_put() nodes held in phandle cache
      of: __of_detach_node() - remove node from phandle cache

Geert Uytterhoeven (1):
      m68k: Fix memblock-related crashes

Greg Kroah-Hartman (2):
      Revert "powerpc/tm: Unset MSR[TS] if not recheckpointing"
      Linux 4.19.15

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

Hans de Goede (1):
      HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk

Himanshu Madhani (1):
      Revert "scsi: qla2xxx: Fix NVMe Target discovery"

Huang Ying (1):
      mm, swap: fix swapoff with KSM pages

Hui Peng (1):
      ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks

Ivan Mironov (1):
      bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw

J. Bruce Fields (1):
      nfsd4: zero-length WRITE should succeed

Jarkko Nikula (1):
      PCI / PM: Allow runtime PM without callback functions

Jason Martinsen (1):
      lan78xx: Resolve issue with changing MAC address

Jerome Brunet (2):
      pinctrl: meson: fix pull enable register calculation
      leds: pwm: silently error out on EPROBE_DEFER

Joel Stanley (4):
      powerpc: Disable -Wbuiltin-requires-header when setjmp is used
      Makefile: Export clang toolchain variables
      powerpc/boot: Set target when cross-compiling for clang
      raid6/ppc: Fix build for clang

Johannes Berg (1):
      nl80211: fix memory leak if validate_pae_over_nl80211() fails

Kangjie Lu (1):
      net: netxen: fix a missing check and an uninitialized use

Kirill A. Shutemov (2):
      x86/mm: Fix guard hole handling
      x86/dump_pagetables: Fix LDT remap address marker

Larry Finger (1):
      b43: Fix error in cordic routine

Lendacky, Thomas (1):
      dma-direct: do not include SME mask in the DMA supported check

Linus Torvalds (1):
      sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b9c

Lorenzo Bianconi (2):
      mt76: fix potential NULL pointer dereference in mt76_stop_tx_queues
      mt76x0: init hw capabilities

Lubomir Rintel (1):
      power: supply: olpc_battery: correct the temperature units

Lyude Paul (1):
      drm/nouveau/drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()

Mans Rullgard (1):
      auxdisplay: charlcd: fix x/y command parsing

Mantas Mikulėnas (1):
      Input: synaptics - enable SMBus for HP EliteBook 840 G4

Mark Zhang (1):
      IB/core: Fix oops in netdev_next_upper_dev_rcu()

Masahiro Yamada (3):
      kbuild: fix false positive warning/error about missing libelf
      kbuild: add -no-integrated-as Clang option unconditionally
      kbuild: consolidate Clang compiler flags

Matthew Wilcox (1):
      Fix failure path in alloc_pid()

Michael Ellerman (1):
      powerpc/mm: Fix linux page tables build with some configs

Michael S. Tsirkin (1):
      virtio: fix test build after uio.h change

Michal Hocko (2):
      hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
      memcg, oom: notify on oom killer invocation from the charge path

Minchan Kim (1):
      zram: fix double free backing device

Ming Lei (1):
      block: deactivate blk_stat timer in wbt_disable_default()

Mircea Caprioru (1):
      iio: dac: ad5686: fix bit shift read register

Nathan Chancellor (1):
      drivers: net: xgene: Remove unnecessary forward declarations

Nicholas Kazlauskas (1):
      drm/amd/display: Fix unintialized max_bpc state values

Nicholas Piggin (3):
      powerpc: remove old GCC version checks
      powerpc: consolidate -mno-sched-epilog into FTRACE flags
      powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer

Oliver O'Halloran (1):
      powerpc/mm: Fallback to RAM if the altmap is unusable

Ondrej Mosnacek (1):
      selinux: policydb - fix byte order and alignment issues

Pan Bian (1):
      netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel

Paul Mackerras (1):
      powerpc: Fix COFF zImage booting on old powermacs

Peter Hutterer (1):
      Input: restore EV_ABS ABS_RESERVED

Qian Cai (1):
      checkstack.pl: fix for aarch64

Rafael J. Wysocki (1):
      driver core: Add missing dev->bus->need_parent_lock checks

Ross Lagerwall (1):
      ixgbe: Fix race when the VF driver does a reset

Ryder Lee (1):
      arm64: dts: mt7622: fix no more console output on rfb1

Sagi Grimberg (1):
      rxe: fix error completion wr_id and qp_num

Sara Sharon (2):
      mac80211: fix a kernel panic when TXing after TXQ teardown
      mac80211: free skb fraglist before freeing the skb

Shaokun Zhang (1):
      drivers/perf: hisi: Fixup one DDRC PMU register offset

Sinan Kaya (1):
      x86, hyperv: remove PCI dependency

Sohil Mehta (1):
      iommu/vt-d: Handle domain agaw being less than iommu agaw

Stefan Assmann (1):
      i40e: fix mac filter delete when setting mac address

Steffen Klassert (1):
      xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.

Steffen Maier (1):
      scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown

Sudarsana Reddy Kalluru (3):
      bnx2x: Clear fip MAC when fcoe offload support is disabled
      bnx2x: Remove configured vlans as part of unload sequence.
      bnx2x: Send update-svid ramrod with retry/poll flags enabled

Taehee Yoo (2):
      netfilter: nf_tables: fix suspicious RCU usage in nft_chain_stats_replace()
      netfilter: nf_conncount: use rb_link_node_rcu() instead of rb_link_node()

Takashi Iwai (3):
      ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
      ALSA: usb-audio: Check mixer unit descriptors more strictly
      ALSA: usb-audio: Always check descriptor sizes in parser code

Thomas Falcon (2):
      ibmvnic: Convert reset work item mutex to spin lock
      ibmvnic: Fix non-atomic memory allocation in IRQ context

Tony Lindgren (1):
      Input: omap-keypad - fix idle configuration to not block SoC idle states

Trond Myklebust (1):
      SUNRPC: Fix a race with XPRT_CONNECTING

Uwe Kleine-König (1):
      gpio: mvebu: only fail on missing clk if pwm is actually to be used

Varun Prakash (2):
      scsi: target: iscsi: cxgbit: fix csk leak
      scsi: target: iscsi: cxgbit: add missing spin_lock_init()

Vasily Averin (6):
      sunrpc: fix cache_head leak due to queued request
      sunrpc: use SVC_NET() in svcauth_gss_* functions
      dlm: fixed memory leaks after failed ls_remove_names allocation
      dlm: possible memory leak on error path in create_lkb()
      dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
      dlm: memory leaks on error path in dlm_user_request()

Wei Yongjun (1):
      xfrm: Fix error return code in xfrm_output_one()

Yan, Zheng (1):
      ceph: don't update importing cap's mseq when handing cap export

Yangtao Li (1):
      serial/sunsu: fix refcount leak

Yishai Hadas (1):
      IB/mlx5: Block DEVX umem from the non applicable cases

Yonglong Liu (10):
      net: hns: Incorrect offset address used for some registers.
      net: hns: All ports can not work when insmod hns ko after rmmod.
      net: hns: Some registers use wrong address according to the datasheet.
      net: hns: Fixed bug that netdev was opened twice
      net: hns: Clean rx fbd when ae stopped.
      net: hns: Free irq when exit from abnormal branch
      net: hns: Avoid net reset caused by pause frames storm
      net: hns: Fix ntuple-filters status error.
      net: hns: Add mac pcs config when enable|disable mac
      net: hns: Fix ping failed when use net bridge and send multicast

YueHaibing (2):
      ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
      video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"

Yussuf Khalil (1):
      Input: synaptics - enable RMI on ThinkPad T560

 Makefile                                           |  30 +-
 arch/arm/boot/dts/imx7d-nitrogen7.dts              |   9 +-
 arch/arm/boot/dts/imx7d-pico.dtsi                  |  22 +-
 arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts       |   4 +-
 arch/arm/mach-imx/cpuidle-imx6sx.c                 |   2 +-
 arch/arm64/Makefile                                |   2 +-
 arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts       |   7 +-
 arch/arm64/kernel/image.h                          |  46 +-
 arch/arm64/kernel/vmlinux.lds.S                    |   9 +-
 arch/m68k/kernel/setup_mm.c                        |   2 -
 arch/m68k/mm/motorola.c                            |   2 +
 arch/powerpc/Makefile                              |  47 +-
 arch/powerpc/boot/Makefile                         |   5 +
 arch/powerpc/boot/crt0.S                           |   4 +-
 arch/powerpc/kernel/Makefile                       |  11 +-
 arch/powerpc/kernel/signal_32.c                    |  38 +-
 arch/powerpc/kernel/signal_64.c                    |  64 +--
 arch/powerpc/kernel/trace/Makefile                 |   2 +-
 arch/powerpc/mm/dump_linuxpagetables.c             |   1 +
 arch/powerpc/mm/init_64.c                          |  19 +-
 arch/powerpc/platforms/powermac/Makefile           |   2 +-
 arch/powerpc/xmon/Makefile                         |   7 +-
 arch/x86/include/asm/pgtable_64_types.h            |   5 +
 arch/x86/mm/dump_pagetables.c                      |  15 +-
 arch/x86/xen/mmu_pv.c                              |  11 +-
 block/blk-mq-sched.c                               |   3 +-
 block/blk-mq-sched.h                               |   1 +
 block/blk-stat.h                                   |   5 +
 block/blk-wbt.c                                    |   4 +-
 block/mq-deadline.c                                |  12 +-
 drivers/auxdisplay/charlcd.c                       |   3 +
 drivers/base/dd.c                                  |   4 +-
 drivers/block/zram/zram_drv.c                      |   4 +-
 drivers/dax/pmem.c                                 |  14 +-
 drivers/gpio/gpio-mvebu.c                          |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   4 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   2 +
 drivers/gpu/drm/nouveau/dispnv50/disp.c            |  12 +-
 drivers/gpu/drm/rockchip/rockchip_drm_psr.c        |   4 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    |   1 +
 drivers/hid/hid-ids.h                              |   3 +
 drivers/hid/hid-ite.c                              |   1 +
 drivers/hv/Kconfig                                 |   2 +-
 drivers/hwtracing/intel_th/msu.c                   |   3 +-
 drivers/iio/dac/ad5686.c                           |   3 +-
 drivers/infiniband/core/roce_gid_mgmt.c            |   3 +
 drivers/infiniband/hw/mlx5/devx.c                  |   4 +-
 drivers/infiniband/sw/rxe/rxe_resp.c               |  13 +-
 drivers/infiniband/ulp/srpt/ib_srpt.c              |  18 +-
 drivers/input/keyboard/omap4-keypad.c              |  16 +-
 drivers/input/mouse/synaptics.c                    |   2 +
 drivers/iommu/intel-iommu.c                        |   4 +-
 drivers/leds/leds-pwm.c                            |   5 +-
 drivers/media/pci/cx23885/cx23885-core.c           |  55 ++-
 drivers/media/pci/cx23885/cx23885.h                |   2 +
 drivers/misc/genwqe/card_utils.c                   |   2 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   3 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |   1 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  54 ++-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   4 +-
 drivers/net/ethernet/cadence/macb_main.c           |  27 +-
 drivers/net/ethernet/cadence/macb_ptp.c            |   2 +
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  |   3 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c |  14 +-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c  |  15 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 503 ++++++++++++++-------
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  |  13 +-
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      |  43 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |  18 +-
 drivers/net/ethernet/ibm/ibmvnic.h                 |   2 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  14 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |  11 +-
 drivers/net/ethernet/microchip/lan743x_main.c      |  11 +-
 drivers/net/ethernet/neterion/vxge/vxge-config.c   |   2 +-
 drivers/net/ethernet/nuvoton/w90p910_ether.c       |   2 +-
 .../net/ethernet/qlogic/netxen/netxen_nic_init.c   |   3 +-
 drivers/net/ethernet/qlogic/qed/qed_ll2.c          |   1 +
 drivers/net/ieee802154/ca8210.c                    |   4 +-
 drivers/net/ieee802154/mac802154_hwsim.c           |   4 +-
 drivers/net/usb/lan78xx.c                          |   4 +
 drivers/net/usb/qmi_wwan.c                         |  15 +-
 drivers/net/wireless/broadcom/b43/phy_common.c     |   2 +-
 drivers/net/wireless/mediatek/mt76/mt76x0/init.c   |   1 +
 drivers/net/wireless/mediatek/mt76/tx.c            |   7 +-
 drivers/nvdimm/pmem.c                              |  13 +-
 drivers/of/base.c                                  | 101 ++++-
 drivers/of/dynamic.c                               |   3 +
 drivers/of/of_private.h                            |   4 +
 drivers/pci/pci-driver.c                           |  27 +-
 drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c      |   4 +-
 drivers/pinctrl/meson/pinctrl-meson.c              |   3 +-
 drivers/power/supply/olpc_battery.c                |   4 +-
 drivers/s390/scsi/zfcp_aux.c                       |   6 +-
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |   2 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |   3 +-
 drivers/scsi/qla2xxx/qla_os.c                      |   4 +-
 drivers/target/iscsi/cxgbit/cxgbit_cm.c            |   5 +-
 drivers/target/iscsi/cxgbit/cxgbit_main.c          |   1 +
 drivers/tty/serial/sunsu.c                         |  31 +-
 drivers/video/fbdev/pxafb.c                        |   4 +-
 fs/ceph/caps.c                                     |   1 -
 fs/dlm/lock.c                                      |  17 +-
 fs/dlm/lockspace.c                                 |   2 +-
 fs/gfs2/inode.c                                    |  18 +-
 fs/gfs2/rgrp.c                                     |   2 +-
 fs/lockd/clntproc.c                                |   2 +-
 fs/lockd/xdr.c                                     |   4 +-
 fs/lockd/xdr4.c                                    |   4 +-
 fs/nfsd/nfs4proc.c                                 |   2 -
 include/linux/hmm.h                                |   4 +-
 include/linux/memremap.h                           |   2 +
 include/linux/netfilter/nfnetlink.h                |  12 -
 include/uapi/linux/input-event-codes.h             |   9 +
 kernel/dma/direct.c                                |  13 +-
 kernel/fork.c                                      |  13 +-
 kernel/memremap.c                                  |  95 ++--
 kernel/pid.c                                       |   6 +-
 kernel/rcu/srcutree.c                              |   2 +
 kernel/sched/fair.c                                |  43 +-
 lib/raid6/Makefile                                 |  15 +
 lib/test_debug_virtual.c                           |   1 +
 mm/hmm.c                                           | 131 ++----
 mm/memcontrol.c                                    |  20 +-
 mm/memory_hotplug.c                                |  16 +
 mm/swapfile.c                                      |   3 +-
 net/9p/client.c                                    |  21 +
 net/mac80211/iface.c                               |   3 +
 net/mac80211/main.c                                |   2 -
 net/mac80211/status.c                              |   5 +
 net/netfilter/ipset/ip_set_list_set.c              |   2 +-
 net/netfilter/nf_conncount.c                       |   2 +-
 net/netfilter/nf_conntrack_seqadj.c                |   7 +-
 net/netfilter/nf_nat_core.c                        |   3 +-
 net/netfilter/nf_tables_api.c                      |  21 +-
 net/netfilter/nf_tables_core.c                     |   2 +-
 net/sunrpc/auth_gss/svcauth_gss.c                  |   8 +-
 net/sunrpc/cache.c                                 |  10 +-
 net/sunrpc/xprtsock.c                              |   4 +-
 net/tls/tls_main.c                                 |   6 +-
 net/wireless/nl80211.c                             |   4 +-
 net/xfrm/xfrm_input.c                              |   7 +-
 net/xfrm/xfrm_output.c                             |   1 +
 net/xfrm/xfrm_state.c                              |   2 +-
 scripts/checkstack.pl                              |   4 +-
 security/selinux/ss/policydb.c                     |  51 ++-
 sound/pci/cs46xx/dsp_spos.c                        |   3 +
 sound/usb/card.c                                   |   2 +-
 sound/usb/mixer.c                                  |  29 +-
 sound/usb/quirks-table.h                           |   6 +
 sound/usb/stream.c                                 |  36 +-
 tools/testing/nvdimm/test/iomap.c                  |  17 +-
 tools/virtio/linux/kernel.h                        |   4 +
 152 files changed, 1463 insertions(+), 815 deletions(-)

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

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

[modify] https://crrev.com/fe16e58c302d949ea067efb6ed8329836a4592af/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
[modify] https://crrev.com/fe16e58c302d949ea067efb6ed8329836a4592af/mm/swapfile.c
[modify] https://crrev.com/fe16e58c302d949ea067efb6ed8329836a4592af/Makefile

Comment 3 by groeck@chromium.org, Jan 17 (6 days ago)

Status: Fixed (was: Started)

Sign in to add a comment