This is the start of the review cycle for the merge of stable release
v5.4.37 into chromeos-5.4. If anyone has issues or concerns
with this stable release being applied, please let me know.
Bug:
https://crbug.com/1077529
Code review:
https://chromium-review.googlesource.com/#/q/2177158
Responses should be made by Tue May 5 08:08:19 PDT 2020.
Anything received after that time might be too late.
Commit message and changelog are as follows.
CHROMIUM: Merge 'v5.4.37' into chromeos-5.4
Merge of v5.4.37 into chromeos-5.4
Conflicts:
block/blk-mq.c
Changelog:
----------------------------------------------------------------
Al Viro (1):
propagate_one(): mnt_set_mountpoint() needs mount_lock
Arnd Bergmann (1):
drivers: soc: xilinx: fix firmware driver Kconfig dependency
Atsushi Nemoto (1):
net: stmmac: socfpga: Allow all RGMII modes
Ayush Sawal (1):
Crypto: chelsio - Fixes a hang issue during driver registration
Bjorn Helgaas (3):
PCI: Make ACS quirk implementations more uniform
PCI: Unify ACS quirk desired vs provided checking
PCI: Move Apex Edge TPU class quirk to fix BAR assignment
Bodo Stroesser (2):
scsi: target: fix PR IN / READ FULL STATUS for FC
scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN
Brian Foster (1):
xfs: acquire superblock freeze protection on eofblocks scans
Chuck Lever (2):
svcrdma: Fix trace point use-after-free race
svcrdma: Fix leak of svc_rdma_recv_ctxt objects
Clement Leger (1):
remoteproc: Fix wrong rvring index computation
Cristian Birsan (1):
usb: gadget: udc: atmel: Fix vbus disconnect handling
Darrick J. Wong (1):
xfs: fix partially uninitialized structure in xfs_reflink_remap_extent
David Howells (4):
afs: Make record checking use TASK_UNINTERRUPTIBLE when appropriate
afs: Fix to actually set AFS_SERVER_FL_HAVE_EPOCH
rxrpc: Fix DATA Tx to disable nofrag for UDP on AF_INET6 socket
afs: Fix length of dump of bad YFSFetchStatus record
Eric Biggers (1):
xfs: clear PF_MEMALLOC before exiting xfsaild thread
Eric Dumazet (1):
net: use indirect call wrappers for skb_copy_datagram_iter()
Eugene Syromiatnikov (1):
taprio: do not use BIT() in TCA_TAPRIO_ATTR_FLAG_* definitions
Fangrui Song (1):
arm64: Delete the space separator in __emit_inst
Greg Kroah-Hartman (1):
Linux 5.4.37
Guenter Roeck (1):
Merge remote-tracking branch 'origin/stable-merge/linux/v5.4.37' into merge/chromeos-5.4-v5.4.37
Hillf Danton (1):
netfilter: nat: fix error handling upon registering inet hook
Hui Wang (1):
ALSA: hda: call runtime_allow() for all hda controllers
Ian Rogers (1):
perf/core: fix parent pid/tid in task exit events
Jann Horn (1):
bpf: Forbid XADD on spilled pointers for unprivileged users
Jason Gunthorpe (1):
net/cxgb4: Check the return from t4_query_params properly
Jeremy Cline (1):
libbpf: Initialize *nl_pid so gcc 10 is happy
Jerome Brunet (1):
ASoC: meson: axg-card: fix codec-to-codec link setup
John Garry (1):
blk-mq: Put driver tag in blk_mq_dispatch_rq_list() when no budget
Josh Poimboeuf (2):
objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings
objtool: Support Clang non-section symbols in ORC dump
Juergen Gross (1):
xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status
Kai-Heng Feng (2):
PCI: Avoid ASMedia XHCI USB PME# from D0 defect
PM: sleep: core: Switch back to async_schedule_dev()
Luke Nelson (3):
bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension
bpf, x86_32: Fix clobbering of dst for BPF_JSET
bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B
Martin Fuzzey (1):
net: fec: set GPR bit on suspend by DT configuration.
Masahiro Yamada (1):
kbuild: fix DT binding schema rule again to avoid needless rebuilds
Maxim Mikityanskiy (1):
net/mlx5e: Don't trigger IRQ multiple times on XSK wakeup to avoid WQ overruns
Nathan Chancellor (1):
usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete
Nicolas Saenz Julienne (1):
ARM: dts: bcm283x: Disable dsi0 node
Niklas Schnelle (2):
s390/pci: do not set affinity for floating irqs
net/mlx5: Fix failing fw tracer allocation on s390
Olaf Hering (1):
x86: hyperv: report value of misc_features
Olivier Moysan (2):
ASoC: stm32: sai: fix sai probe
ASoC: stm32: spdifrx: fix regmap status check
Philipp Puschmann (1):
ASoC: tas571x: disable regulators on failed probe
Philipp Rudo (1):
s390/ftrace: fix potential crashes when switching tracers
Pierre-Louis Bossart (1):
ASoC: soc-core: disable route checks for legacy devices
Quentin Perret (1):
sched/core: Fix reset-on-fork from RT with uclamp
Raymond Pang (3):
PCI: Add ACS quirk for Zhaoxin multi-function devices
PCI: Add Zhaoxin Vendor ID
PCI: Add ACS quirk for Zhaoxin Root/Downstream Ports
Richard Weinberger (1):
ubifs: Fix ubifs_tnc_lookup() usage in do_kill_orphans()
Ritesh Harjani (1):
ext4: check for non-zero journal inum in ext4_calculate_overhead
Roy Spliet (1):
ALSA: hda: Explicitly permit using autosuspend if runtime PM is supported
Sascha Hauer (1):
hwmon: (jc42) Fix name to have no illegal characters
Sergey Senozhatsky (1):
printk: queue wake_up_klogd irq_work only if per-CPU areas are ready
Shengjiu Wang (1):
ASoC: wm8960: Fix wrong clock after suspend & resume
Stephan Gerhold (1):
ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs
Syed Nayyar Waris (1):
counter: 104-quad-8: Add lock guards - generic interface
Takashi Iwai (2):
ALSA: hda: Release resources at error in delayed probe
ALSA: hda: Keep the controller initialization even if no codecs found
Tamizh chelvam (1):
mac80211: fix channel switch trigger from unknown mesh peer
Theodore Ts'o (2):
ext4: increase wait time needed before reuse of deleted inode numbers
ext4: convert BUG_ON's to WARN_ON's in mballoc.c
Thinh Nguyen (1):
usb: dwc3: gadget: Do link recovery for SS and SSP
Toke Høiland-Jørgensen (1):
cpumap: Avoid warning when CONFIG_DEBUG_PER_CPU_MAPS is enabled
Vasily Averin (1):
nfsd: memory corruption in nfsd4_lock()
Vitor Massaru Iha (1):
um: ensure `make ARCH=um mrproper` removes arch/$(SUBARCH)/include/generated/
Waiman Long (1):
blk-iocost: Fix error on iocost_ioc_vrate_adj
Wang YanQing (1):
bpf, x86_32: Fix logic error in BPF_LDX zero-extension
Wolfram Sang (1):
i2c: altera: use proper variable to hold errno
Yang Shi (1):
mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path
YueHaibing (1):
iio:ad7797: Use correct attribute_group
Yuval Basson (2):
qed: Fix race condition between scheduling and destroying the slowpath workqueue
qed: Fix use after free in qed_chain_free
Zhiqiang Liu (1):
signal: check sig before setting info in kill_pid_usb_asyncio
Zhu Yanjun (1):
net/mlx5e: Get the latest values from counters in switchdev mode
yangerkun (1):
ext4: use matching invalidatepage in ext4_writepage
Makefile | 2 +-
arch/arm/boot/dts/bcm283x.dtsi | 1 +
arch/arm64/include/asm/sysreg.h | 4 +-
arch/s390/kernel/diag.c | 2 +-
arch/s390/kernel/smp.c | 4 +-
arch/s390/kernel/trace.c | 2 +-
arch/s390/pci/pci_irq.c | 5 +-
arch/um/Makefile | 1 +
arch/x86/kernel/cpu/mshyperv.c | 4 +-
arch/x86/net/bpf_jit_comp.c | 18 +-
arch/x86/net/bpf_jit_comp32.c | 28 ++-
block/blk-iocost.c | 4 +-
drivers/base/power/main.c | 2 +-
drivers/counter/104-quad-8.c | 194 +++++++++++++++++----
drivers/crypto/chelsio/chcr_core.c | 2 -
drivers/hwmon/jc42.c | 2 +-
drivers/i2c/busses/i2c-altera.c | 9 +-
drivers/iio/adc/ad7793.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +-
drivers/net/ethernet/freescale/fec.h | 7 +
drivers/net/ethernet/freescale/fec_main.c | 149 +++++++++++++---
.../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 6 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +-
.../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 3 +
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 8 +-
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 6 +-
drivers/net/ethernet/qlogic/qed/qed_dev.c | 38 ++--
drivers/net/ethernet/qlogic/qed/qed_main.c | 13 +-
.../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +
drivers/pci/quirks.c | 143 +++++++++++----
drivers/remoteproc/remoteproc_core.c | 2 +-
drivers/soc/xilinx/Kconfig | 4 +-
drivers/staging/gasket/apex_driver.c | 7 -
drivers/target/target_core_fabric_lib.c | 2 +-
drivers/target/target_core_user.c | 1 +
drivers/usb/dwc3/gadget.c | 8 +-
drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +-
drivers/usb/gadget/udc/bdc/bdc_ep.c | 2 +-
drivers/xen/xenbus/xenbus_client.c | 9 +-
fs/afs/cmservice.c | 2 +-
fs/afs/internal.h | 2 +-
fs/afs/rotate.c | 6 +-
fs/afs/server.c | 7 +-
fs/afs/volume.c | 8 +-
fs/afs/yfsclient.c | 6 +-
fs/ext4/ialloc.c | 2 +-
fs/ext4/inode.c | 2 +-
fs/ext4/mballoc.c | 6 +-
fs/ext4/super.c | 3 +-
fs/nfsd/nfs4state.c | 2 +
fs/pnode.c | 9 +-
fs/ubifs/orphan.c | 4 +-
fs/xfs/xfs_icache.c | 10 ++
fs/xfs/xfs_ioctl.c | 5 +-
fs/xfs/xfs_reflink.c | 1 +
fs/xfs/xfs_trans_ail.c | 4 +-
include/linux/pci_ids.h | 2 +
include/linux/qed/qed_chain.h | 24 ++-
include/linux/sunrpc/svc_rdma.h | 1 +
include/trace/events/iocost.h | 6 +-
include/trace/events/rpcrdma.h | 50 ++++--
include/uapi/linux/pkt_sched.h | 4 +-
kernel/bpf/cpumap.c | 2 +-
kernel/bpf/verifier.c | 28 ++-
kernel/events/core.c | 13 +-
kernel/sched/core.c | 9 +-
kernel/signal.c | 6 +-
mm/shmem.c | 4 +-
net/core/datagram.c | 14 +-
net/mac80211/mesh.c | 11 +-
net/netfilter/nf_nat_proto.c | 4 +-
net/rxrpc/local_object.c | 9 -
net/rxrpc/output.c | 44 ++---
net/sunrpc/svc_xprt.c | 3 -
net/sunrpc/svcsock.c | 4 +
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 22 +++
net/sunrpc/xprtrdma/svc_rdma_rw.c | 3 +-
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 29 ++-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 -
scripts/Makefile.lib | 2 +-
sound/pci/hda/hda_intel.c | 46 +++--
sound/pci/hda/hda_intel.h | 1 +
sound/soc/codecs/tas571x.c | 20 ++-
sound/soc/codecs/wm8960.c | 3 +-
sound/soc/meson/axg-card.c | 4 +-
sound/soc/qcom/qdsp6/q6afe-dai.c | 16 ++
sound/soc/stm/stm32_sai_sub.c | 12 +-
sound/soc/stm/stm32_spdifrx.c | 2 +
tools/lib/bpf/netlink.c | 4 +-
tools/objtool/check.c | 17 +-
tools/objtool/orc_dump.c | 44 +++--
.../selftests/bpf/verifier/value_illegal_alu.c | 1 +
93 files changed, 848 insertions(+), 412 deletions(-)
BUG=chromium:1077529
TEST=Build and test on various affected systems
Change-Id: Id9cd518bb88c1f4aef736407c580391219d9f0a6
Signed-off-by: Guenter Roeck <
gro...@chromium.org>