Skip to contentSkip to conversation

Linux 5.4.295

DISCUSSION Greg Kroah-Hartman 1 participant 2 messages Jun 27, 2025 Stable branch

lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

I'm announcing the release of the 5.4.295 kernel.

All users of the 5.4 kernel series must upgrade.

The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/admin-guide/kernel-parameters.txt     |    2 
 MAINTAINERS                                         |    9 +
 Makefile                                            |    2 
 arch/arm/boot/dts/am335x-bone-common.dtsi           |    8 +
 arch/arm/boot/dts/at91sam9263ek.dts                 |    2 
 arch/arm/boot/dts/qcom-apq8064.dtsi                 |   13 -
 arch/arm/boot/dts/tny_a9263.dts                     |    2 
 arch/arm/boot/dts/usb_a9263.dts                     |    4 
 arch/arm/mach-omap2/clockdomain.h                   |    1 
 arch/arm/mach-omap2/clockdomains33xx_data.c         |    2 
 arch/arm/mach-omap2/cm33xx.c                        |   14 +-
 arch/arm/mm/ioremap.c                               |    4 
 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |    8 -
 arch/arm64/kernel/ptrace.c                          |    2 
 arch/arm64/xen/hypercall.S                          |   21 ++-
 arch/m68k/mac/config.c                              |    2 
 arch/mips/Makefile                                  |    2 
 arch/mips/vdso/Makefile                             |    1 
 arch/nios2/include/asm/pgtable.h                    |   16 ++
 arch/parisc/boot/compressed/Makefile                |    1 
 arch/powerpc/kernel/eeh.c                           |    2 
 arch/s390/pci/pci_mmio.c                            |    2 
 arch/x86/boot/compressed/Makefile                   |    2 
 arch/x86/kernel/cpu/bugs.c                          |   10 -
 arch/x86/kernel/cpu/common.c                        |   17 +-
 arch/x86/kernel/cpu/mtrr/generic.c                  |    2 
 drivers/acpi/acpica/dsutils.c                       |    9 +
 drivers/acpi/acpica/psobject.c                      |   52 ++-----
 drivers/acpi/battery.c                              |   19 ++
 drivers/acpi/osi.c                                  |    1 
 drivers/ata/pata_via.c                              |    3 
 drivers/atm/atmtcp.c                                |    4 
 drivers/base/power/domain.c                         |    2 
 drivers/base/power/main.c                           |    3 
 drivers/base/power/runtime.c                        |    2 
 drivers/block/aoe/aoedev.c                          |    8 +
 drivers/bus/fsl-mc/fsl-mc-bus.c                     |    6 
 drivers/bus/fsl-mc/mc-io.c                          |   19 +-
 drivers/bus/fsl-mc/mc-sys.c                         |    2 
 drivers/bus/ti-sysc.c                               |   49 -------
 drivers/clk/rockchip/clk-rk3036.c                   |    1 
 drivers/cpufreq/cpufreq.c                           |    6 
 drivers/crypto/marvell/cipher.c                     |    3 
 drivers/crypto/marvell/hash.c                       |    2 
 drivers/edac/altera_edac.c                          |    6 
 drivers/edac/skx_common.c                           |    1 
 drivers/firmware/psci/psci.c                        |    4 
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c              |    2 
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c               |    2 
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c               |    2 
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c               |    2 
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c               |    2 
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c     |    4 
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c   |   18 +-
 drivers/gpu/drm/amd/display/dc/dcn20/Makefile       |    2 
 drivers/gpu/drm/amd/display/dc/dcn21/Makefile       |    2 
 drivers/gpu/drm/amd/display/dc/dml/Makefile         |    3 
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c  |    5 
 drivers/gpu/drm/msm/adreno/a6xx_hfi.c               |    2 
 drivers/gpu/drm/msm/hdmi/hdmi_i2c.c                 |   14 +-
 drivers/gpu/drm/nouveau/nouveau_backlight.c         |    2 
 drivers/gpu/drm/rcar-du/rcar_du_kms.c               |   10 -
 drivers/gpu/drm/tegra/rgb.c                         |   14 +-
 drivers/gpu/drm/vkms/vkms_crtc.c                    |    2 
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c             |   26 +++
 drivers/hid/hid-hyperv.c                            |    5 
 drivers/hid/usbhid/hid-core.c                       |   25 ++-
 drivers/hwmon/occ/common.c                          |   28 +---
 drivers/i2c/busses/i2c-designware-slave.c           |    2 
 drivers/iio/adc/ad7606_spi.c                        |    2 
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c          |    1 
 drivers/infiniband/hw/hns/hns_roce_hw_v2.h          |    1 
 drivers/infiniband/hw/hns/hns_roce_restrack.c       |    1 
 drivers/input/misc/ims-pcu.c                        |    6 
 drivers/input/misc/sparcspkr.c                      |   22 ++-
 drivers/input/rmi4/rmi_f34.c                        |  137 +++++++++++---------
 drivers/md/dm-raid1.c                               |    5 
 drivers/media/i2c/tc358743.c                        |    4 
 drivers/media/platform/exynos4-is/fimc-is-regs.c    |    1 
 drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c      |    7 -
 drivers/media/v4l2-core/v4l2-dev.c                  |   14 +-
 drivers/mfd/exynos-lpass.c                          |    1 
 drivers/mfd/stmpe-spi.c                             |    2 
 drivers/mtd/nand/raw/sunxi_nand.c                   |    2 
 drivers/net/ethernet/cadence/macb_main.c            |    6 
 drivers/net/ethernet/dlink/dl2k.c                   |   14 +-
 drivers/net/ethernet/dlink/dl2k.h                   |    2 
 drivers/net/ethernet/emulex/benet/be_cmds.c         |    2 
 drivers/net/ethernet/intel/i40e/i40e_common.c       |    7 -
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c  |   11 +
 drivers/net/ethernet/intel/ice/ice_sched.c          |   11 -
 drivers/net/ethernet/mellanox/mlx4/en_clock.c       |    2 
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c     |    1 
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c   |   13 +
 drivers/net/ethernet/microchip/lan743x_main.c       |    4 
 drivers/net/phy/mdio_bus.c                          |   16 ++
 drivers/net/usb/aqc111.c                            |   10 +
 drivers/net/usb/ch9200.c                            |    7 -
 drivers/net/vxlan.c                                 |    8 -
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c     |    3 
 drivers/net/wireless/ath/carl9170/usb.c             |   19 +-
 drivers/net/wireless/intersil/p54/fwio.c            |    2 
 drivers/net/wireless/intersil/p54/p54.h             |    1 
 drivers/net/wireless/intersil/p54/txrx.c            |   13 +
 drivers/net/wireless/realtek/rtlwifi/pci.c          |   10 +
 drivers/net/wireless/realtek/rtw88/rtw8822c.c       |    3 
 drivers/pci/pci.c                                   |    3 
 drivers/pci/quirks.c                                |   23 +++
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c         |   35 +++--
 drivers/pinctrl/pinctrl-at91.c                      |    6 
 drivers/platform/Kconfig                            |    2 
 drivers/platform/Makefile                           |    1 
 drivers/platform/surface/Kconfig                    |   14 ++
 drivers/platform/surface/Makefile                   |    5 
 drivers/platform/x86/dell_rbu.c                     |    2 
 drivers/power/supply/bq27xxx_battery.c              |    2 
 drivers/power/supply/bq27xxx_battery_i2c.c          |   13 +
 drivers/rapidio/rio_cm.c                            |    3 
 drivers/regulator/max14577-regulator.c              |    5 
 drivers/rpmsg/qcom_smd.c                            |    2 
 drivers/rtc/Kconfig                                 |   10 +
 drivers/rtc/Makefile                                |    1 
 drivers/rtc/class.c                                 |    2 
 drivers/rtc/lib.c                                   |  127 ++++++++++++++----
 drivers/rtc/lib_test.c                              |   79 +++++++++++
 drivers/rtc/rtc-sh.c                                |   12 +
 drivers/s390/scsi/zfcp_sysfs.c                      |    2 
 drivers/scsi/lpfc/lpfc_sli.c                        |    4 
 drivers/scsi/qedf/qedf_main.c                       |    2 
 drivers/scsi/scsi_transport_iscsi.c                 |   11 -
 drivers/scsi/storvsc_drv.c                          |   10 -
 drivers/soc/aspeed/aspeed-lpc-snoop.c               |   17 ++
 drivers/spi/spi-sh-msiof.c                          |   13 +
 drivers/staging/iio/impedance-analyzer/ad5933.c     |    2 
 drivers/tee/tee_core.c                              |   11 -
 drivers/thunderbolt/ctl.c                           |    5 
 drivers/tty/serial/milbeaut_usio.c                  |    5 
 drivers/tty/vt/vt_ioctl.c                           |    2 
 drivers/uio/uio_hv_generic.c                        |    4 
 drivers/usb/class/usbtmc.c                          |    4 
 drivers/usb/core/hub.c                              |   16 ++
 drivers/usb/core/quirks.c                           |    3 
 drivers/usb/gadget/function/f_hid.c                 |   12 -
 drivers/usb/renesas_usbhs/common.c                  |   50 +++++--
 drivers/usb/storage/unusual_uas.h                   |    7 +
 drivers/video/console/vgacon.c                      |    2 
 drivers/video/fbdev/core/fbcvt.c                    |    2 
 drivers/video/fbdev/core/fbmem.c                    |    4 
 drivers/watchdog/da9052_wdt.c                       |    1 
 fs/configfs/dir.c                                   |    2 
 fs/ext4/extents.c                                   |   11 -
 fs/ext4/inline.c                                    |    2 
 fs/f2fs/data.c                                      |    2 
 fs/f2fs/f2fs.h                                      |   10 +
 fs/f2fs/namei.c                                     |   19 ++
 fs/f2fs/super.c                                     |    4 
 fs/filesystems.c                                    |   14 +-
 fs/gfs2/inode.c                                     |    3 
 fs/gfs2/lock_dlm.c                                  |    3 
 fs/jbd2/transaction.c                               |    3 
 fs/jffs2/erase.c                                    |    4 
 fs/jffs2/scan.c                                     |    4 
 fs/jffs2/summary.c                                  |    7 -
 fs/jfs/jfs_discard.c                                |    3 
 fs/jfs/jfs_dtree.c                                  |   18 ++
 fs/namespace.c                                      |    4 
 fs/nfsd/nfs3xdr.c                                   |    2 
 fs/nfsd/nfs4proc.c                                  |    3 
 fs/nfsd/vfs.c                                       |    4 
 fs/nilfs2/btree.c                                   |    4 
 fs/nilfs2/direct.c                                  |    3 
 fs/squashfs/super.c                                 |    5 
 include/acpi/actypes.h                              |    2 
 include/linux/atmdev.h                              |    6 
 include/linux/hid.h                                 |    3 
 include/trace/events/erofs.h                        |   18 --
 include/uapi/linux/videodev2.h                      |    1 
 ipc/shm.c                                           |    5 
 kernel/events/core.c                                |   23 ++-
 kernel/exit.c                                       |   17 +-
 kernel/power/wakelock.c                             |    3 
 kernel/time/posix-cpu-timers.c                      |    9 +
 kernel/trace/bpf_trace.c                            |    2 
 kernel/trace/ftrace.c                               |   10 +
 kernel/trace/trace.c                                |    2 
 mm/huge_memory.c                                    |    2 
 mm/page-writeback.c                                 |    2 
 net/atm/common.c                                    |    1 
 net/atm/lec.c                                       |   12 +
 net/atm/raw.c                                       |    2 
 net/bluetooth/l2cap_core.c                          |    3 
 net/bridge/netfilter/nf_conntrack_bridge.c          |   12 -
 net/core/sock.c                                     |    4 
 net/ipv4/route.c                                    |    4 
 net/ipv4/tcp_input.c                                |   63 +++++----
 net/ipv6/calipso.c                                  |    8 +
 net/ipv6/netfilter.c                                |   12 -
 net/ipv6/netfilter/nft_fib_ipv6.c                   |   13 +
 net/mac80211/mesh_hwmp.c                            |    6 
 net/mpls/af_mpls.c                                  |    4 
 net/ncsi/internal.h                                 |   21 +--
 net/ncsi/ncsi-pkt.h                                 |   23 +--
 net/ncsi/ncsi-rsp.c                                 |   21 +--
 net/netfilter/nft_socket.c                          |    3 
 net/netlabel/netlabel_kapi.c                        |    5 
 net/nfc/nci/uart.c                                  |    8 -
 net/sched/sch_prio.c                                |    2 
 net/sched/sch_red.c                                 |    2 
 net/sched/sch_sfq.c                                 |    5 
 net/sched/sch_tbf.c                                 |    2 
 net/sctp/socket.c                                   |    3 
 net/sunrpc/cache.c                                  |    2 
 net/sunrpc/xprtrdma/verbs.c                         |    2 
 net/tipc/udp_media.c                                |    4 
 net/tls/tls_sw.c                                    |    7 +
 security/selinux/xfrm.c                             |    2 
 sound/pci/hda/hda_intel.c                           |    2 
 sound/pci/hda/patch_realtek.c                       |    1 
 tools/perf/builtin-record.c                         |    2 
 tools/perf/scripts/python/exported-sql-viewer.py    |    5 
 tools/perf/tests/switch-tracking.c                  |    2 
 tools/perf/ui/browsers/hists.c                      |    2 
 tools/testing/selftests/seccomp/seccomp_bpf.c       |    7 -
 223 files changed, 1298 insertions(+), 652 deletions(-)

Aditya Dutt (1):
jfs: fix array-index-out-of-bounds read in add_missing_indices

Adrian Hunter (1):
perf scripts python: exported-sql-viewer.py: Fix pattern matching with Python 3

Ahmed S. Darwish (1):

      x86/cpu: Sanitize CPUID(0x80000000) output

Ahmed Salem (1):
ACPICA: Avoid sequence overread in call to strncmp()

Akhil P Oommen (1):
drm/msm/a6xx: Increase HFI response timeout

Al Viro (1):
do_change_type(): refuse to operate on unmounted/not ours mounts

Alex Deucher (5):
drm/amdgpu/gfx6: fix CSIB handling
drm/amdgpu/gfx10: fix CSIB handling
drm/amdgpu/gfx7: fix CSIB handling
drm/amdgpu/gfx8: fix CSIB handling
drm/amdgpu/gfx9: fix CSIB handling

Alexander Aring (1):
gfs2: move msleep to sleepable context

Alexander Sverdlin (1):
Revert "bus: ti-sysc: Probe for l4_wkup and l4_cfg interconnect devices first"

Alexandre Mergnat (2):
rtc: Fix offset calculation for .start_secs < 0
rtc: Make rtc_time64_to_tm() support dates before 1970

Alexey Gladkov (1):
mfd: stmpe-spi: Correct the name used in MODULE_DEVICE_TABLE

Alok Tiwari (2):
scsi: iscsi: Fix incorrect error path labels for flashnode operations emulex/benet: correct command version selection in be_cmd_get_stats()

Amber Lin (1):
drm/amdkfd: Set SDMA_RLCx_IB_CNTL/SWITCH_INSIDE_IB

Andreas Gruenbacher (1):
gfs2: gfs2_create_inode error handling fix

Andrew Lunn (1):
net: mdio: C22 is now optional, EOPNOTSUPP if not provided

Andrew Morton (1):
drivers/rapidio/rio_cm.c: prevent possible heap overwrite

Andy Shevchenko (1):
pinctrl: at91: Fix possible out-of-boundary access

Armin Wolf (1):
ACPI: OSI: Stop advertising support for "3.0 _SCP Extensions"

Arnaldo Carvalho de Melo (1):

      perf ui browser hists: Set actions->thread before calling do_zoom_thread()

Arnd Bergmann (2):
parisc: fix building with gcc-15
hwmon: (occ) fix unaligned accesses

Artem Sadovnikov (1):
jffs2: check that raw node were preallocated before writing summary

Benjamin Berg (1):
wifi: mac80211: do not offer a mesh path if forwarding is disabled

Biju Das (2):
drm: rcar-du: Fix memory leak in rcar_du_vsps_init() drm/tegra: rgb: Fix the unbound reference count

Breno Leitao (1):
Revert "x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2" on v6.6 and older

Cassio Neri (1):
rtc: Improve performance of rtc_time64_to_tm(). Add tests.

Chao Yu (2):
f2fs: fix to do sanity check on sbi->total_valid_block_count
f2fs: clean up w/ fscrypt_is_bounce_page()

Charan Teja Kalla (1):
PM: runtime: fix denying of auto suspend in pm_suspend_timer_fn()

Christian Lamparter (1):
wifi: p54: prevent buffer-overflow in p54_rx_eeprom_readback()

Christophe JAILLET (1):
mfd: exynos-lpass: Avoid calling exynos_lpass_disable() twice in exynos_lpass_remove()

Chuck Lever (2):
NFSD: Fix ia_size underflow
NFSD: Fix NFSv3 SETATTR/CREATE's handling of large file sizes

Colin Foster (1):
ARM: dts: am335x-bone-common: Increase MDIO reset deassert time

Damon Ding (1):
drm/bridge: analogix_dp: Add irq flag IRQF_NO_AUTOEN instead of calling disable_irq()

Dan Aloni (1):
xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create

Dan Carpenter (4):
rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send() net/mlx4_en: Prevent potential integer overflow calculating Hz
pmdomain: core: Fix error checking in genpd_dev_pm_attach_by_id()
Input: ims-pcu - check record size in ims_pcu_flash_firmware()

Daniel Wagner (1):
scsi: lpfc: Use memcpy() for BIOS version

Dapeng Mi (1):
perf record: Fix incorrect --user-regs comments

Dave Penkler (1):
usb: usbtmc: Fix timeout value in get_stb

David Gow (1):
rtc: test: Fix invalid format specifier.

David Lechner (1):
iio: adc: ad7606_spi: fix reg write value mask

Dexuan Cui (1):
scsi: storvsc: Increase the timeouts to storvsc_timeout

Dmitry Antipov (2):
wifi: rtw88: do not ignore hardware read error during DPK
wifi: carl9170: do not ping device which has failed to load firmware

Dmitry Baryshkov (2):
ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device drm/msm/hdmi: add runtime PM calls to DDC transfer function

Dmitry Torokhov (1):
Input: synaptics-rmi - fix crash with unsupported versions of F34

Dylan Wolff (1):
jfs: Fix null-ptr-deref in jfs_ioc_trim

Eric Dumazet (9):
net_sched: sch_sfq: fix a potential crash on gso_skb handling
net_sched: prio: fix a race in prio_tune()
net_sched: red: fix a race in __red_change()
net_sched: tbf: fix a race in tbf_change()
calipso: unlock rcu before returning -EAFNOSUPPORT
tcp: always seek for minimal rtt in tcp_rcv_rtt_update()
tcp: fix initial tp->rcvq_space.space value for passive TS enabled flows
net: atm: add lec_mutex
net: atm: fix /proc/net/atm/lec handling

Fedor Pchelkin (1):
jffs2: check jffs2_prealloc_raw_node_refs() result in few other places

Finn Thain (1):
m68k: mac: Fix macintosh_config for Mac II

Florian Westphal (2):
netfilter: nft_socket: fix sk refcount leaks
netfilter: nf_tables: nft_fib_ipv6: fix VRF ipv4/ipv6 result discrepancy

GONG Ruiqi (1):
vgacon: Add check for vc_origin address range in vgacon_scroll()

Gabor Juhos (6):
pinctrl: armada-37xx: use correct OUTPUT_VAL register for GPIOs > 31
pinctrl: armada-37xx: set GPIO output value before setting direction
pinctrl: armada-37xx: propagate error from armada_37xx_pmx_set_by_name()
pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get_direction()
pinctrl: armada-37xx: propagate error from armada_37xx_pmx_gpio_set_direction()
pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get()

Gabriel Shahrouzi (1):
staging: iio: ad5933: Correct settling cycles encoding per datasheet

Gao Xiang (1):
erofs: remove unused trace event erofs_destroy_inode

Gavin Guo (1):
mm/huge_memory: fix dereferencing invalid pmd migration entry

Geert Uytterhoeven (2):
spi: sh-msiof: Fix maximum DMA transfer size
ARM: dts: am335x-bone-common: Increase MDIO reset deassert delay to 50ms

Greg Kroah-Hartman (1):

      Linux 5.4.295

Haixia Qu (1):
tipc: fix null-ptr-deref when acquiring remote ip of ethernet bearer

Hans Verkuil (1):
media: tc358743: ignore video while HPD is low

Hari Kalavakunta (1):
net: ncsi: Fix GCPS 64-bit member variables

Heiko Carstens (1):
s390/pci: Fix __pcilg_mio_inuser() inline assembly

Heiko Stuebner (1):
clk: rockchip: rk3036: mark ddrphy as critical

Henry Martin (2):
soc: aspeed: Add NULL check in aspeed_lpc_enable_snoop()
serial: Fix potential null-ptr-deref in mlb_usio_probe()

Herbert Xu (2):
crypto: marvell/cesa - Handle zero-length skcipher requests
crypto: marvell/cesa - Avoid empty transfer descriptor

Hongyu Xie (1):
usb: storage: Ignore UAS driver for SanDisk 3.2 Gen2 storage device

Huacai Chen (1):
PCI: Add ACS quirk for Loongson PCIe

Huajian Yang (1):
netfilter: bridge: Move specific fragmented packet to slow_path instead of dropping it

Ian Forbes (1):
drm/vmwgfx: Add seqno waiter for sync_files

Ido Schimmel (1):
vxlan: Do not treat dst cache initialization errors as fatal

Ilpo Järvinen (1):
PCI: Fix lock symmetry in pci_slot_unlock()

Ioana Ciornei (2):
bus: fsl-mc: fix double-free on mc_dev
bus: fsl-mc: do not add a device-link for the UAPI used DPMCP device

Jacob Keller (1):
drm/nouveau/bl: increase buffer size to avoid truncate warning

Jaegeuk Kim (1):
f2fs: prevent kernel warning due to negative i_nlink from corrupted image

Jakub Raczynski (1):
net/mdiobus: Fix potential out-of-bounds read/write access

Jan Kara (1):
ext4: fix calculation of credits for extent tree modification

Jann Horn (1):
tee: Prevent size calculation wraparound on 32-bit kernels

Jason Xing (1):
net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info

Jeongjun Park (2):
ipc: fix to protect IPCS lookups using RCU
jbd2: fix data-race and null-ptr-deref in jbd2_journal_dirty_metadata()

Jerry Lv (1):
power: supply: bq27xxx: Retrieve again when busy

Jiaqing Zhao (1):
x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges()

Jiayi Li (1):
usb: quirks: Add NO_LPM quirk for SanDisk Extreme 55AE

Jiayuan Chen (1):
ktls, sockmap: Fix missing uncharge operation

Jinliang Zheng (1):
mm: fix ratelimit_pages update error in dirty_ratio_handler()

Jonathan Lane (1):
ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged

Junxian Huang (1):
RDMA/hns: Include hnae3.h in hns_roce_hw_v2.h

Justin Sanders (1):
aoe: clean device rq_list in aoedev_downdev()

Kees Cook (2):
drm/vkms: Adjust vkms_state->active_planes allocation type
scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops

Khem Raj (1):
mips: Add -std= flag specified in KBUILD_CFLAGS to vdso CFLAGS

Krzysztof Kozlowski (1):

      NFC: nci: uart: Set tty->disc_data only in success path

Kuniyuki Iwashima (5):
calipso: Don't call calipso functions for AF_INET sk.
atm: Revert atm_account_tx() if copy_from_iter_full() fails.
mpls: Use rcu_dereference_rtnl() in mpls_route_input_rcu().
atm: atmtcp: Free invalid length skb in atmtcp_c_send().
calipso: Fix null-ptr-deref in calipso_req_{set,del}attr().

Kyungwook Boo (1):
i40e: fix MMIO write access to an invalid page in i40e_clear_hw

Lad Prabhakar (1):
usb: renesas_usbhs: Reorder clock handling and power management in probe

Laurentiu Tudor (1):
bus: fsl-mc: increase MC_CMD_COMPLETION_TIMEOUT_MS value

Leo Yan (1):
perf tests switch-tracking: Fix timestamp comparison

Long Li (2):
uio_hv_generic: Use correct size for interrupt and monitor pages
sunrpc: update nextcheck time when adding new cache entries

Luiz Augusto von Dentz (1):
Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION

Ma Ke (1):
media: v4l2-dev: fix error handling in __video_register_device()

Marcus Folkesson (1):
watchdog: da9052_wdt: respect TWDMIN

Mathias Nyman (1):
usb: Flush altsetting 0 endpoints before reinitializating them after reset.

Maximilian Luz (1):
platform: Add Surface platform directory

Miaoqian Lin (1):
firmware: psci: Fix refcount leak in psci_dt_init

Michal Kubiak (1):
ice: create new Tx scheduler nodes for new queues only

Mikulas Patocka (1):
dm-mirror: fix a tiny race condition

Mingcong Bai (1):
wifi: rtlwifi: disable ASPM for RTL8723BE with subsystem ID 11ad:1723

Moon Yeounsu (1):
net: dlink: add synchronization for stats update

Murad Masimov (1):
fbdev: Fix fb_set_var to prevent null-ptr-deref in fb_videomode_to_var

Narayana Murty N (1):
powerpc/eeh: Fix missing PE bridge reconfiguration during VFIO EEH recovery

Nas Chung (1):
media: uapi: v4l: Fix V4L2_TYPE_IS_OUTPUT condition

Nathan Chancellor (3):
MIPS: Move '-Wa,-msoft-float' check from as-option to cc-option drm/amd/display: Do not add '-mhard-float' to dml_ccflags for clang drm/amd/display: Do not add '-mhard-float' to dcn2{1,0}_resource.o for clang

Neal Cardwell (1):
tcp: fix tcp_packet_delayed() for tcp_is_non_sack_preventing_reopen() behavior

NeilBrown (1):
nfsd: nfsd4_spo_must_allow() must check this is a v4 compound request

Neill Kapron (1):
selftests/seccomp: fix syscall_restart test for arm compat

Nick Desaulniers (1):
x86/boot/compressed: prefer cc-option for CFLAGS additions

Nicolas Pitre (1):
vt: remove VT_RESIZE and VT_RESIZEX from vt_compat_ioctl()

Nikita Zhandarovich (1):
net: usb: aqc111: fix error handling of usbnet read calls

Niravkumar L Rabara (1):
EDAC/altera: Use correct write width with the INTTEST register

Oleg Nesterov (1):
posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

Oliver Neukum (1):
net: usb: aqc111: debug info before sanitation

Pan Taixi (1):
tracing: Fix compilation warning on arm32

Patrisious Haddad (1):
net/mlx5: Fix return value when searching for existing flow group

Paul Blakey (1):
net/mlx5: Wait for inactive autogroups

Peter Marheine (1):
ACPI: battery: negate current when discharging

Peter Oberparleiter (1):
scsi: s390: zfcp: Ensure synchronous unit_add

Peter Zijlstra (1):
perf: Fix sample vs do_exit()

Petr Malat (1):
sctp: Do not wake readers in __sctp_write_space()

Phillip Lougher (1):
Squashfs: check return result of sb_min_blocksize

Qasim Ijaz (1):
net: ch9200: fix uninitialised access during mii_nway_restart

Qing Wang (1):
perf/core: Fix broken throttling when max_samples_per_tick=1

Qiuxu Zhuo (1):
EDAC/skx_common: Fix general protection fault

Quentin Schulz (1):
arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma with Haikou

Rafael J. Wysocki (1):
PM: sleep: Fix power.is_suspended cleanup for direct-complete devices

Robert Malz (2):
i40e: return false from i40e_reset_vf if reset is in progress
i40e: retry VFLR handling if there is ongoing VF reset

Ross Stutterheim (1):

      ARM: 9447/1: arm/memremap: fix arch_memremap_can_ram_remap()

Ryusuke Konishi (1):
nilfs2: do not propagate ENOENT error from nilfs_btree_propagate()

Sebastian Andrzej Siewior (1):
ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT

Sergey Senozhatsky (1):
thunderbolt: Do not double dequeue a configuration request

Sergey Shtylyov (1):
fbdev: core: fbcvt: avoid division by 0 in fb_cvt_hperiod()

Sergio Perez Gonzalez (1):
net: macb: Check return value of dma_set_mask_and_coherent()

Seunghun Han (2):
ACPICA: fix acpi operand cache leak in dswstate.c
ACPICA: fix acpi parse and parseext cache leaks

Shengyu Qu (1):
ARM: dts: am335x-bone-common: Add GPIO PHY reset on revision C3 board

Simon Schuster (1):
nios2: force update_mmu_cache on spurious tlb-permission--related pagefaults

Srinivasan Shanmugam (1):
drm/amd/display: Add NULL pointer checks in dm_force_atomic_commit()

Stefano Stabellini (1):
xen/arm: call uaccess_ttbr0_enable for dm_op hypercall

Stephen Smalley (1):
selinux: fix selinux_xfrm_alloc_user() to set correct ctx_len

Stuart Hayes (1):
platform/x86: dell_rbu: Stop overwriting data buffer

Su Hui (1):
soc: aspeed: lpc: Fix impossible judgment condition

Sukrut Bellary (1):
ARM: OMAP2+: Fix l4ls clk domain handling in STANDBY

Takashi Iwai (1):
ALSA: hda/intel: Add Thinkpad E15 to PM deny list

Tan En De (1):
i2c: designware: Invoke runtime suspend on quick slave re-registration

Tao Chen (1):
bpf: Fix WARN() in get_bpf_raw_tp_regs

Tasos Sahanidis (1):
ata: pata_via: Force PIO for ATAPI devices on VT6415/VT6330

Tengda Wu (1):
arm64/ptrace: Fix stack-out-of-bounds read in regs_get_kernel_stack_nth()

Terry Junge (1):
HID: usbhid: Eliminate recurrent out-of-bounds bug in usbhid_parse()

Thadeu Lima de Souza Cascardo (1):
ext4: inline: fix len overflow in ext4_prepare_inline_data

Thangaraj Samynathan (1):

      net: lan743x: rename lan743x_reset_phy to lan743x_hw_reset_phy

Toke Høiland-Jørgensen (1):
wifi: ath9k_htc: Abort software beacon handling if disabled

Viresh Kumar (1):
cpufreq: Force sync policy boost with global boost on sysfs update

WangYuli (1):
Input: sparcspkr - avoid unannotated fall-through

Wentao Liang (6):
nilfs2: add pointer check for nilfs_direct_propagate()
media: gspca: Add error handling for stv06xx_read_sensor()
mtd: rawnand: sunxi: Add randomizer configuration in sunxi_nfc_hw_ecc_write_chunk
mtd: nand: sunxi: Add randomizer configuration before randomizer enable
regulator: max14577: Add error check for max14577_read_reg()
media: platform: exynos4-is: Add hardware sync wait to fimc_is_hw_change_mode()

Wolfram Sang (3):
ARM: dts: at91: usb_a9263: fix GPIO for Dataflash chip select
ARM: dts: at91: at91sam9263: fix NAND chip selects
rtc: sh: assign correct interrupts with DT

Ye Bin (1):
ftrace: Fix UAF when lookup kallsym after ftrace disabled

Zhiguo Niu (2):
f2fs: use d_inode(dentry) cleanup dentry->d_inode
f2fs: fix to correct check conditions in f2fs_cross_rename

Zijun Hu (4):
PM: wakeup: Delete space in the end of string shown by pm_show_wakelocks() fs/filesystems: Fix potential unsigned integer underflow in fs_name()
configfs: Do not override creating attribute file failure in populate_attrs()
sock: Correct error checking condition for (assign|release)_proto_idx()

zhang songyi (1):
Input: synaptics-rmi4 - convert to use sysfs_emit() APIs

author maintainer
#1 lore raw
Documentation/admin-guide/kernel-parameters.txt +0 -2
index 6d9acc3f977b..9975dcab99c3 100644
@@ -4600,8 +4600,6 @@
 
 			Selecting 'on' will also enable the mitigation
 			against user space to user space task attacks.
-			Selecting specific mitigation does not force enable
-			user mitigations.
 
 			Selecting 'off' will disable both the kernel and
 			the user space protections.
MAINTAINERS +9 -0
index 2040c2f76dcf..474daf91a054 100644
@@ -10819,6 +10819,15 @@ L:	[email protected]
 S:	Supported
 F:	drivers/net/ethernet/mscc/
 
+MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
+M:	Hans de Goede <[email protected]>
+M:	Mark Gross <[email protected]>
+M:	Maximilian Luz <[email protected]>
+L:	[email protected]
+S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
+F:	drivers/platform/surface/
+
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:	Chen Yu <[email protected]>
 L:	[email protected]
Makefile +1 -1
index cc8e29781c25..730f498dd1ef 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 4
-SUBLEVEL = 294
+SUBLEVEL = 295
 EXTRAVERSION =
 NAME = Kleptomaniac Octopus
 
arch/arm/boot/dts/am335x-bone-common.dtsi +8 -0
index 89b4cf2cb7f8..a8b009b44d81 100644
@@ -145,6 +145,8 @@
 			/* MDIO */
 			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
 			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
+			/* Added to support GPIO controlled PHY reset */
+			AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7)
 		>;
 	};
 
@@ -153,6 +155,8 @@
 			/* MDIO reset value */
 			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
 			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			/* Added to support GPIO controlled PHY reset */
+			AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
 		>;
 	};
 
@@ -396,6 +400,10 @@
 
 	ethphy0: ethernet-phy@0 {
 		reg = <0>;
+		/* Support GPIO reset on revision C3 boards */
+		reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+		reset-assert-us = <300>;
+		reset-deassert-us = <50000>;
 	};
 };
 
arch/arm/boot/dts/at91sam9263ek.dts +1 -1
index 62d218542a48..64e4a56b30e0 100644
@@ -147,7 +147,7 @@
 				nand@3 {
 					reg = <0x3 0x0 0x800000>;
 					rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
-					cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
+					cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
 					nand-bus-width = <8>;
 					nand-ecc-mode = "soft";
 					nand-on-flash-bbt;
arch/arm/boot/dts/qcom-apq8064.dtsi +4 -9
index cd200910ccdf..f3131dae731a 100644
@@ -211,12 +211,6 @@
 		};
 	};
 
-	sfpb_mutex: hwmutex {
-		compatible = "qcom,sfpb-mutex";
-		syscon = <&sfpb_wrapper_mutex 0x604 0x4>;
-		#hwlock-cells = <1>;
-	};
-
 	smem {
 		compatible = "qcom,smem";
 		memory-region = <&smem_region>;
@@ -359,9 +353,10 @@
 			pinctrl-0 = <&ps_hold>;
 		};
 
-		sfpb_wrapper_mutex: syscon@1200000 {
-			compatible = "syscon";
-			reg = <0x01200000 0x8000>;
+		sfpb_mutex: hwmutex@1200600 {
+			compatible = "qcom,sfpb-mutex";
+			reg = <0x01200600 0x100>;
+			#hwlock-cells = <1>;
 		};
 
 		intc: interrupt-controller@2000000 {
arch/arm/boot/dts/tny_a9263.dts +1 -1
index 2820635952e3..f31bacf641b4 100644
@@ -64,7 +64,7 @@
 				nand@3 {
 					reg = <0x3 0x0 0x800000>;
 					rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
-					cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
+					cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
 					nand-bus-width = <8>;
 					nand-ecc-mode = "soft";
 					nand-on-flash-bbt;
arch/arm/boot/dts/usb_a9263.dts +2 -2
index e7a705fddda9..a22c7628e2b5 100644
@@ -58,7 +58,7 @@
 			};
 
 			spi0: spi@fffa4000 {
-				cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>;
+				cs-gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
 				status = "okay";
 				mtd_dataflash@0 {
 					compatible = "atmel,at45", "atmel,dataflash";
@@ -84,7 +84,7 @@
 				nand@3 {
 					reg = <0x3 0x0 0x800000>;
 					rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
-					cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
+					cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
 					nand-bus-width = <8>;
 					nand-ecc-mode = "soft";
 					nand-on-flash-bbt;
arch/arm/mach-omap2/clockdomain.h +1 -0
index 68550b23c938..eb6ca2ea8067 100644
@@ -48,6 +48,7 @@
 #define CLKDM_NO_AUTODEPS			(1 << 4)
 #define CLKDM_ACTIVE_WITH_MPU			(1 << 5)
 #define CLKDM_MISSING_IDLE_REPORTING		(1 << 6)
+#define CLKDM_STANDBY_FORCE_WAKEUP		BIT(7)
 
 #define CLKDM_CAN_HWSUP		(CLKDM_CAN_ENABLE_AUTO | CLKDM_CAN_DISABLE_AUTO)
 #define CLKDM_CAN_SWSUP		(CLKDM_CAN_FORCE_SLEEP | CLKDM_CAN_FORCE_WAKEUP)
arch/arm/mach-omap2/clockdomains33xx_data.c +1 -1
index 32c90fd9eba2..3303c41dcefe 100644
@@ -27,7 +27,7 @@ static struct clockdomain l4ls_am33xx_clkdm = {
 	.pwrdm		= { .name = "per_pwrdm" },
 	.cm_inst	= AM33XX_CM_PER_MOD,
 	.clkdm_offs	= AM33XX_CM_PER_L4LS_CLKSTCTRL_OFFSET,
-	.flags		= CLKDM_CAN_SWSUP,
+	.flags		= CLKDM_CAN_SWSUP | CLKDM_STANDBY_FORCE_WAKEUP,
 };
 
 static struct clockdomain l3s_am33xx_clkdm = {
arch/arm/mach-omap2/cm33xx.c +13 -1
index 084d454f6074..430a9de563a4 100644
@@ -28,6 +28,9 @@
 #include "cm-regbits-34xx.h"
 #include "cm-regbits-33xx.h"
 #include "prm33xx.h"
+#if IS_ENABLED(CONFIG_SUSPEND)
+#include <linux/suspend.h>
+#endif
 
 /*
  * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield:
@@ -336,8 +339,17 @@ static int am33xx_clkdm_clk_disable(struct clockdomain *clkdm)
 {
 	bool hwsup = false;
 
+#if IS_ENABLED(CONFIG_SUSPEND)
+	/*
+	 * In case of standby, Don't put the l4ls clk domain to sleep.
+	 * Since CM3 PM FW doesn't wake-up/enable the l4ls clk domain
+	 * upon wake-up, CM3 PM FW fails to wake-up th MPU.
+	 */
+	if (pm_suspend_target_state == PM_SUSPEND_STANDBY &&
+	    (clkdm->flags & CLKDM_STANDBY_FORCE_WAKEUP))
+		return 0;
+#endif
 	hwsup = am33xx_cm_is_clkdm_in_hwsup(clkdm->cm_inst, clkdm->clkdm_offs);
-
 	if (!hwsup && (clkdm->flags & CLKDM_CAN_FORCE_SLEEP))
 		am33xx_clkdm_sleep(clkdm);
 
arch/arm/mm/ioremap.c +1 -3
index 841b66515b37..5278c98f08c9 100644
@@ -504,7 +504,5 @@ void __init early_ioremap_init(void)
 bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,
 				 unsigned long flags)
 {
-	unsigned long pfn = PHYS_PFN(offset);
-
-	return memblock_is_map_memory(pfn);
+	return memblock_is_map_memory(offset);
 }
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +0 -8
index d29937e4a606..ea3fbd8da2cf 100644
@@ -246,14 +246,6 @@
 	status = "okay";
 };
 
-&usb_host0_ehci {
-	status = "okay";
-};
-
-&usb_host0_ohci {
-	status = "okay";
-};
-
 &vopb {
 	status = "okay";
 };
arch/arm64/kernel/ptrace.c +1 -1
index 8a95a013dfd3..8fcf03968f11 100644
@@ -140,7 +140,7 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n)
 
 	addr += n;
 	if (regs_within_kernel_stack(regs, (unsigned long)addr))
-		return *addr;
+		return READ_ONCE_NOCHECK(*addr);
 	else
 		return 0;
 }
arch/arm64/xen/hypercall.S +20 -1
index c5f05c4a4d00..f5660a45d6ea 100644
@@ -84,7 +84,26 @@ HYPERCALL1(tmem_op);
 HYPERCALL1(platform_op_raw);
 HYPERCALL2(multicall);
 HYPERCALL2(vm_assist);
-HYPERCALL3(dm_op);
+
+SYM_FUNC_START(HYPERVISOR_dm_op)
+	mov x16, #__HYPERVISOR_dm_op;	\
+	/*
+	 * dm_op hypercalls are issued by the userspace. The kernel needs to
+	 * enable access to TTBR0_EL1 as the hypervisor would issue stage 1
+	 * translations to user memory via AT instructions. Since AT
+	 * instructions are not affected by the PAN bit (ARMv8.1), we only
+	 * need the explicit uaccess_enable/disable if the TTBR0 PAN emulation
+	 * is enabled (it implies that hardware UAO and PAN disabled).
+	 */
+	uaccess_ttbr0_enable x6, x7, x8
+	hvc XEN_IMM
+
+	/*
+	 * Disable userspace access from kernel once the hyp call completed.
+	 */
+	uaccess_ttbr0_disable x6, x7
+	ret
+SYM_FUNC_END(HYPERVISOR_dm_op);
 
 ENTRY(privcmd_call)
 	mov x16, x0
arch/m68k/mac/config.c +1 -1
index d0126ab01360..41041c442233 100644
@@ -804,7 +804,7 @@ static void __init mac_identify(void)
 	}
 
 	macintosh_config = mac_data_table;
-	for (m = macintosh_config; m->ident != -1; m++) {
+	for (m = &mac_data_table[1]; m->ident != -1; m++) {
 		if (m->ident == model) {
 			macintosh_config = m;
 			break;
arch/mips/Makefile +1 -1
index e2a2e5df4fde..4542258027a7 100644
@@ -107,7 +107,7 @@ endif
 # (specifically newer than 2.24.51.20140728) we then also need to explicitly
 # set ".set hardfloat" in all files which manipulate floating point registers.
 #
-ifneq ($(call as-option,-Wa$(comma)-msoft-float,),)
+ifneq ($(call cc-option,$(cflags-y) -Wa$(comma)-msoft-float,),)
 	cflags-y		+= -DGAS_HAS_SET_HARDFLOAT -Wa,-msoft-float
 endif
 
arch/mips/vdso/Makefile +1 -0
index d3cd9c4cadc2..33704b6bf064 100644
@@ -25,6 +25,7 @@ ccflags-vdso := \
 # offsets.
 cflags-vdso := $(ccflags-vdso) \
 	$(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \
+	$(filter -std=%,$(KBUILD_CFLAGS)) \
 	-O3 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \
 	-fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \
 	$(call cc-option, -fno-asynchronous-unwind-tables) \
arch/nios2/include/asm/pgtable.h +16 -0
index 99985d8b7166..506bbc773087 100644
@@ -297,4 +297,20 @@ extern void __init mmu_init(void);
 extern void update_mmu_cache(struct vm_area_struct *vma,
 			     unsigned long address, pte_t *pte);
 
+static inline int pte_same(pte_t pte_a, pte_t pte_b);
+
+#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
+static inline int ptep_set_access_flags(struct vm_area_struct *vma,
+					unsigned long address, pte_t *ptep,
+					pte_t entry, int dirty)
+{
+	if (!pte_same(*ptep, entry))
+		set_ptes(vma->vm_mm, address, ptep, entry, 1);
+	/*
+	 * update_mmu_cache will unconditionally execute, handling both
+	 * the case that the PTE changed and the spurious fault case.
+	 */
+	return true;
+}
+
 #endif /* _ASM_NIOS2_PGTABLE_H */
arch/parisc/boot/compressed/Makefile +1 -0
index 1e5879c6a752..98d69488e5c2 100644
@@ -21,6 +21,7 @@ KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
 ifndef CONFIG_64BIT
 KBUILD_CFLAGS += -mfast-indirect-calls
 endif
+KBUILD_CFLAGS += -std=gnu11
 
 OBJECTS += $(obj)/head.o $(obj)/real2.o $(obj)/firmware.o $(obj)/misc.o $(obj)/piggy.o
 
arch/powerpc/kernel/eeh.c +2 -0
index 8b0e523b2abb..301654971b32 100644
@@ -1723,6 +1723,8 @@ int eeh_pe_configure(struct eeh_pe *pe)
 	/* Invalid PE ? */
 	if (!pe)
 		return -ENODEV;
+	else
+		ret = eeh_ops->configure_bridge(pe);
 
 	return ret;
 }
arch/s390/pci/pci_mmio.c +1 -1
index 675e6cb50584..e28c84a53f92 100644
@@ -227,7 +227,7 @@ static inline int __pcilg_mio_inuser(
 		:
 		[cc] "+d" (cc), [val] "=d" (val), [len] "+d" (len),
 		[dst] "+a" (dst), [cnt] "+d" (cnt), [tmp] "=d" (tmp),
-		[shift] "+d" (shift)
+		[shift] "+a" (shift)
 		:
 		[ioaddr] "a" (addr)
 		: "cc", "memory");
arch/x86/boot/compressed/Makefile +1 -1
index edfb1a718510..62ef24bb2313 100644
@@ -39,7 +39,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
 KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
 KBUILD_CFLAGS += -Wno-pointer-sign
 # Disable relocation relaxation in case the link is not PIE.
-KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)
+KBUILD_CFLAGS += $(call cc-option,-Wa$(comma)-mrelax-relocations=no)
 
 KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
 GCOV_PROFILE := n
arch/x86/kernel/cpu/bugs.c +3 -7
index 0f523ebfbabf..4f803aed2ef0 100644
@@ -1050,13 +1050,9 @@ static __ro_after_init enum spectre_v2_mitigation_cmd spectre_v2_cmd;
 static enum spectre_v2_user_cmd __init
 spectre_v2_parse_user_cmdline(void)
 {
-	enum spectre_v2_user_cmd mode;
 	char arg[20];
 	int ret, i;
 
-	mode = IS_ENABLED(CONFIG_MITIGATION_SPECTRE_V2) ?
-		SPECTRE_V2_USER_CMD_AUTO : SPECTRE_V2_USER_CMD_NONE;
-
 	switch (spectre_v2_cmd) {
 	case SPECTRE_V2_CMD_NONE:
 		return SPECTRE_V2_USER_CMD_NONE;
@@ -1069,7 +1065,7 @@ spectre_v2_parse_user_cmdline(void)
 	ret = cmdline_find_option(boot_command_line, "spectre_v2_user",
 				  arg, sizeof(arg));
 	if (ret < 0)
-		return mode;
+		return SPECTRE_V2_USER_CMD_AUTO;
 
 	for (i = 0; i < ARRAY_SIZE(v2_user_options); i++) {
 		if (match_option(arg, ret, v2_user_options[i].option)) {
@@ -1079,8 +1075,8 @@ spectre_v2_parse_user_cmdline(void)
 		}
 	}
 
-	pr_err("Unknown user space protection option (%s). Switching to default\n", arg);
-	return mode;
+	pr_err("Unknown user space protection option (%s). Switching to AUTO select\n", arg);
+	return SPECTRE_V2_USER_CMD_AUTO;
 }
 
 static inline bool spectre_v2_in_eibrs_mode(enum spectre_v2_mitigation mode)
arch/x86/kernel/cpu/common.c +9 -8
index ae9d8aa3ae48..bd29a436e87e 100644
@@ -934,17 +934,18 @@ void get_cpu_cap(struct cpuinfo_x86 *c)
 		c->x86_capability[CPUID_D_1_EAX] = eax;
 	}
 
-	/* AMD-defined flags: level 0x80000001 */
+	/*
+	 * Check if extended CPUID leaves are implemented: Max extended
+	 * CPUID leaf must be in the 0x80000001-0x8000ffff range.
+	 */
 	eax = cpuid_eax(0x80000000);
-	c->extended_cpuid_level = eax;
+	c->extended_cpuid_level = ((eax & 0xffff0000) == 0x80000000) ? eax : 0;
 
-	if ((eax & 0xffff0000) == 0x80000000) {
-		if (eax >= 0x80000001) {
-			cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
+	if (c->extended_cpuid_level >= 0x80000001) {
+		cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
 
-			c->x86_capability[CPUID_8000_0001_ECX] = ecx;
-			c->x86_capability[CPUID_8000_0001_EDX] = edx;
-		}
+		c->x86_capability[CPUID_8000_0001_ECX] = ecx;
+		c->x86_capability[CPUID_8000_0001_EDX] = edx;
 	}
 
 	if (c->extended_cpuid_level >= 0x80000007) {
arch/x86/kernel/cpu/mtrr/generic.c +1 -1
index 4ea906fe1c35..d15152126877 100644
@@ -350,7 +350,7 @@ static void get_fixed_ranges(mtrr_type *frs)
 
 void mtrr_save_fixed_ranges(void *info)
 {
-	if (boot_cpu_has(X86_FEATURE_MTRR))
+	if (mtrr_state.have_fixed)
 		get_fixed_ranges(mtrr_state.fixed_ranges);
 }
 
drivers/acpi/acpica/dsutils.c +8 -1
index fb9ed5e1da89..2bdae8a25e08 100644
@@ -668,6 +668,8 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
 	union acpi_parse_object *arguments[ACPI_OBJ_NUM_OPERANDS];
 	u32 arg_count = 0;
 	u32 index = walk_state->num_operands;
+	u32 prev_num_operands = walk_state->num_operands;
+	u32 new_num_operands;
 	u32 i;
 
 	ACPI_FUNCTION_TRACE_PTR(ds_create_operands, first_arg);
@@ -696,6 +698,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
 
 	/* Create the interpreter arguments, in reverse order */
 
+	new_num_operands = index;
 	index--;
 	for (i = 0; i < arg_count; i++) {
 		arg = arguments[index];
@@ -720,7 +723,11 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
 	 * pop everything off of the operand stack and delete those
 	 * objects
 	 */
-	acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
+	walk_state->num_operands = i;
+	acpi_ds_obj_stack_pop_and_delete(new_num_operands, walk_state);
+
+	/* Restore operand count */
+	walk_state->num_operands = prev_num_operands;
 
 	ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %u", index));
 	return_ACPI_STATUS(status);
drivers/acpi/acpica/psobject.c +15 -37

83 lines not on this page · raw message

drivers/acpi/battery.c +16 -3
index cf853e985d6d..a5e120eca7f3 100644
@@ -266,10 +266,23 @@ static int acpi_battery_get_property(struct power_supply *psy,
 		break;
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
 	case POWER_SUPPLY_PROP_POWER_NOW:
-		if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
+		if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN) {
 			ret = -ENODEV;
-		else
-			val->intval = battery->rate_now * 1000;
+			break;
+		}
+
+		val->intval = battery->rate_now * 1000;
+		/*
+		 * When discharging, the current should be reported as a
+		 * negative number as per the power supply class interface
+		 * definition.
+		 */
+		if (psp == POWER_SUPPLY_PROP_CURRENT_NOW &&
+		    (battery->state & ACPI_BATTERY_STATE_DISCHARGING) &&
+		    acpi_battery_handle_discharging(battery)
+				== POWER_SUPPLY_STATUS_DISCHARGING)
+			val->intval = -val->intval;
+
 		break;
 	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
 	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
drivers/acpi/osi.c +0 -1
index bec0bebc7f52..763d4b804511 100644
@@ -42,7 +42,6 @@ static struct acpi_osi_entry
 osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = {
 	{"Module Device", true},
 	{"Processor Device", true},
-	{"3.0 _SCP Extensions", true},
 	{"Processor Aggregator Device", true},
 	/*
 	 * Linux-Dell-Video is used by BIOS to disable RTD3 for NVidia graphics
drivers/ata/pata_via.c +2 -1
index 38044e679795..e5c4d954514d 100644
@@ -368,7 +368,8 @@ static unsigned long via_mode_filter(struct ata_device *dev, unsigned long mask)
 	}
 
 	if (dev->class == ATA_DEV_ATAPI &&
-	    dmi_check_system(no_atapi_dma_dmi_table)) {
+	    (dmi_check_system(no_atapi_dma_dmi_table) ||
+	     config->id == PCI_DEVICE_ID_VIA_6415)) {
 		ata_dev_warn(dev, "controller locks up on ATAPI DMA, forcing PIO\n");
 		mask &= ATA_MASK_PIO;
 	}
drivers/atm/atmtcp.c +3 -1
index 7f814da3c2d0..afc1af542c3b 100644
@@ -288,7 +288,9 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
 	struct sk_buff *new_skb;
 	int result = 0;
 
-	if (!skb->len) return 0;
+	if (skb->len < sizeof(struct atmtcp_hdr))
+		goto done;
+
 	dev = vcc->dev_data;
 	hdr = (struct atmtcp_hdr *) skb->data;
 	if (hdr->length == ATMTCP_HDR_MAGIC) {
drivers/base/power/domain.c +1 -1
index eed4c865a4bf..2ccd0c8003e2 100644
@@ -2509,7 +2509,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
 	/* Verify that the index is within a valid range. */
 	num_domains = of_count_phandle_with_args(dev->of_node, "power-domains",
 						 "#power-domain-cells");
-	if (index >= num_domains)
+	if (num_domains < 0 || index >= num_domains)
 		return NULL;
 
 	/* Allocate and register device on the genpd bus. */
drivers/base/power/main.c +2 -1
index 7375624de564..6ad29e0793a5 100644
@@ -971,6 +971,8 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
 	if (!dev->power.is_suspended)
 		goto Complete;
 
+	dev->power.is_suspended = false;
+
 	if (dev->power.direct_complete) {
 		/* Match the pm_runtime_disable() in __device_suspend(). */
 		pm_runtime_enable(dev);
@@ -1026,7 +1028,6 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
 
  End:
 	error = dpm_run_callback(callback, dev, state, info);
-	dev->power.is_suspended = false;
 
 	device_unlock(dev);
 	dpm_watchdog_clear(&wd);
drivers/base/power/runtime.c +1 -1
index d301a6de762d..7fa231076ad5 100644
@@ -982,7 +982,7 @@ static enum hrtimer_restart  pm_suspend_timer_fn(struct hrtimer *timer)
 	 * If 'expires' is after the current time, we've been called
 	 * too early.
 	 */
-	if (expires > 0 && expires < ktime_get_mono_fast_ns()) {
+	if (expires > 0 && expires <= ktime_get_mono_fast_ns()) {
 		dev->power.timer_expires = 0;
 		rpm_suspend(dev, dev->power.timer_autosuspends ?
 		    (RPM_ASYNC | RPM_AUTO) : RPM_ASYNC);
drivers/block/aoe/aoedev.c +8 -0
index e2ea2356da06..ec043f4bb1f2 100644
@@ -198,6 +198,7 @@ aoedev_downdev(struct aoedev *d)
 {
 	struct aoetgt *t, **tt, **te;
 	struct list_head *head, *pos, *nx;
+	struct request *rq, *rqnext;
 	int i;
 
 	d->flags &= ~DEVFL_UP;
@@ -223,6 +224,13 @@ aoedev_downdev(struct aoedev *d)
 	/* clean out the in-process request (if any) */
 	aoe_failip(d);
 
+	/* clean out any queued block requests */
+	list_for_each_entry_safe(rq, rqnext, &d->rq_list, queuelist) {
+		list_del_init(&rq->queuelist);
+		blk_mq_start_request(rq);
+		blk_mq_end_request(rq, BLK_STS_IOERR);
+	}
+
 	/* fast fail all pending I/O */
 	if (d->blkq) {
 		/* UP is cleared, freeze+quiesce to insure all are errored */
drivers/bus/fsl-mc/fsl-mc-bus.c +4 -2
index 5c9bf2e06552..3a2107d1c539 100644
@@ -679,8 +679,10 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
 
 error_cleanup_dev:
 	kfree(mc_dev->regions);
-	kfree(mc_bus);
-	kfree(mc_dev);
+	if (mc_bus)
+		kfree(mc_bus);
+	else
+		kfree(mc_dev);
 
 	return error;
 }
drivers/bus/fsl-mc/mc-io.c +13 -6
index 0a4a387b615d..6b4a08aacaff 100644
@@ -214,12 +214,19 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,
 	if (error < 0)
 		goto error_cleanup_resource;
 
-	dpmcp_dev->consumer_link = device_link_add(&mc_dev->dev,
-						   &dpmcp_dev->dev,
-						   DL_FLAG_AUTOREMOVE_CONSUMER);
-	if (!dpmcp_dev->consumer_link) {
-		error = -EINVAL;
-		goto error_cleanup_mc_io;
+	/* If the DPRC device itself tries to allocate a portal (usually for
+	 * UAPI interaction), don't add a device link between them since the
+	 * DPMCP device is an actual child device of the DPRC and a reverse
+	 * dependency is not allowed.
+	 */
+	if (mc_dev != mc_bus_dev) {
+		dpmcp_dev->consumer_link = device_link_add(&mc_dev->dev,
+							   &dpmcp_dev->dev,
+							   DL_FLAG_AUTOREMOVE_CONSUMER);
+		if (!dpmcp_dev->consumer_link) {
+			error = -EINVAL;
+			goto error_cleanup_mc_io;
+		}
 	}
 
 	*new_mc_io = mc_io;
drivers/bus/fsl-mc/mc-sys.c +1 -1
index 3221a7fbaf0a..24307ed59d77 100644
@@ -19,7 +19,7 @@
 /**
  * Timeout in milliseconds to wait for the completion of an MC command
  */
-#define MC_CMD_COMPLETION_TIMEOUT_MS	500
+#define MC_CMD_COMPLETION_TIMEOUT_MS	15000
 
 /*
  * usleep_range() min and max values used to throttle down polling
drivers/bus/ti-sysc.c +0 -49

61 lines not on this page · raw message

drivers/clk/rockchip/clk-rk3036.c +1 -0
index 6a46f85ad837..4a8c72d99573 100644
@@ -429,6 +429,7 @@ static const char *const rk3036_critical_clocks[] __initconst = {
 	"hclk_peri",
 	"pclk_peri",
 	"pclk_ddrupctl",
+	"ddrphy",
 };
 
 static void __init rk3036_clk_init(struct device_node *np)
drivers/cpufreq/cpufreq.c +4 -2
index 09510ff16ee2..2a2fea6743aa 100644
@@ -2580,8 +2580,10 @@ int cpufreq_boost_trigger_state(int state)
 	unsigned long flags;
 	int ret = 0;
 
-	if (cpufreq_driver->boost_enabled == state)
-		return 0;
+	/*
+	 * Don't compare 'cpufreq_driver->boost_enabled' with 'state' here to
+	 * make sure all policies are in sync with global boost flag.
+	 */
 
 	write_lock_irqsave(&cpufreq_driver_lock, flags);
 	cpufreq_driver->boost_enabled = state;
drivers/crypto/marvell/cipher.c +3 -0
index c7d433d1cd99..f92f86c94bff 100644
@@ -447,6 +447,9 @@ static int mv_cesa_skcipher_queue_req(struct skcipher_request *req,
 	struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
 	struct mv_cesa_engine *engine;
 
+	if (!req->cryptlen)
+		return 0;
+
 	ret = mv_cesa_skcipher_req_init(req, tmpl);
 	if (ret)
 		return ret;
drivers/crypto/marvell/hash.c +1 -1
index a2b35fb0fb89..de1599bca3b7 100644
@@ -630,7 +630,7 @@ static int mv_cesa_ahash_dma_req_init(struct ahash_request *req)
 	if (ret)
 		goto err_free_tdma;
 
-	if (iter.src.sg) {
+	if (iter.base.len > iter.src.op_offset) {
 		/*
 		 * Add all the new data, inserting an operation block and
 		 * launch command between each full SRAM block-worth of
drivers/edac/altera_edac.c +3 -3
index ecc5248f014f..4e1a9a2574ce 100644
@@ -1804,9 +1804,9 @@ static ssize_t altr_edac_a10_device_trig(struct file *file,
 
 	local_irq_save(flags);
 	if (trig_type == ALTR_UE_TRIGGER_CHAR)
-		writel(priv->ue_set_mask, set_addr);
+		writew(priv->ue_set_mask, set_addr);
 	else
-		writel(priv->ce_set_mask, set_addr);
+		writew(priv->ce_set_mask, set_addr);
 
 	/* Ensure the interrupt test bits are set */
 	wmb();
@@ -1836,7 +1836,7 @@ static ssize_t altr_edac_a10_device_trig2(struct file *file,
 
 	local_irq_save(flags);
 	if (trig_type == ALTR_UE_TRIGGER_CHAR) {
-		writel(priv->ue_set_mask, set_addr);
+		writew(priv->ue_set_mask, set_addr);
 	} else {
 		/* Setup read/write of 4 bytes */
 		writel(ECC_WORD_WRITE, drvdata->base + ECC_BLK_DBYTECTRL_OFST);
drivers/edac/skx_common.c +1 -0
index b298b189bdf3..37d76d591745 100644
@@ -112,6 +112,7 @@ EXPORT_SYMBOL_GPL(skx_adxl_get);
 
 void skx_adxl_put(void)
 {
+	adxl_component_count = 0;
 	kfree(adxl_values);
 	kfree(adxl_msg);
 }
drivers/firmware/psci/psci.c +3 -1
index eb797081d159..f1926972b267 100644
@@ -573,8 +573,10 @@ int __init psci_dt_init(void)
 
 	np = of_find_matching_node_and_match(NULL, psci_of_match, &matched_np);
 
-	if (!np || !of_device_is_available(np))
+	if (!np || !of_device_is_available(np)) {
+		of_node_put(np);
 		return -ENODEV;
+	}
 
 	init_fn = (psci_initcall_t)matched_np->data;
 	ret = init_fn(np);
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0 -2
index a84deb3c79a3..44380923b01c 100644
@@ -944,8 +944,6 @@ static void gfx_v10_0_get_csb_buffer(struct amdgpu_device *adev,
 						PACKET3_SET_CONTEXT_REG_START);
 				for (i = 0; i < ext->reg_count; i++)
 					buffer[count++] = cpu_to_le32(ext->extent[i]);
-			} else {
-				return;
 			}
 		}
 	}
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -2
index 7f0a63628c43..eac329fe2790 100644
@@ -2901,8 +2901,6 @@ static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev,
 				buffer[count++] = cpu_to_le32(ext->reg_index - 0xa000);
 				for (i = 0; i < ext->reg_count; i++)
 					buffer[count++] = cpu_to_le32(ext->extent[i]);
-			} else {
-				return;
 			}
 		}
 	}
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +0 -2
index d92e92e5d50b..c1c3fb4d283d 100644
@@ -3992,8 +3992,6 @@ static void gfx_v7_0_get_csb_buffer(struct amdgpu_device *adev,
 				buffer[count++] = cpu_to_le32(ext->reg_index - PACKET3_SET_CONTEXT_REG_START);
 				for (i = 0; i < ext->reg_count; i++)
 					buffer[count++] = cpu_to_le32(ext->extent[i]);
-			} else {
-				return;
 			}
 		}
 	}
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -2
index 467ed7fca884..79347df0620d 100644
@@ -1267,8 +1267,6 @@ static void gfx_v8_0_get_csb_buffer(struct amdgpu_device *adev,
 						PACKET3_SET_CONTEXT_REG_START);
 				for (i = 0; i < ext->reg_count; i++)
 					buffer[count++] = cpu_to_le32(ext->extent[i]);
-			} else {
-				return;
 			}
 		}
 	}
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -2
index 4eba6b2d9cde..3e2fe8f2ccae 100644
@@ -1472,8 +1472,6 @@ static void gfx_v9_0_get_csb_buffer(struct amdgpu_device *adev,
 						PACKET3_SET_CONTEXT_REG_START);
 				for (i = 0; i < ext->reg_count; i++)
 					buffer[count++] = cpu_to_le32(ext->extent[i]);
-			} else {
-				return;
 			}
 		}
 	}
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +4 -0
index d978fcac2665..4110cdc71f04 100644
@@ -387,6 +387,10 @@ static void update_mqd_sdma(struct mqd_manager *mm, void *mqd,
 	m->sdma_engine_id = q->sdma_engine_id;
 	m->sdma_queue_id = q->sdma_queue_id;
 	m->sdmax_rlcx_dummy_reg = SDMA_RLC_DUMMY_DEFAULT;
+	/* Allow context switch so we don't cross-process starve with a massive
+	 * command buffer of long-running SDMA commands
+	 */
+	m->sdmax_rlcx_ib_cntl |= SDMA0_GFX_IB_CNTL__SWITCH_INSIDE_IB_MASK;
 
 	q->is_active = QUEUE_IS_ACTIVE(*q);
 }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +12 -6
index 869b38908b28..e6aa17052aa1 100644
@@ -6505,16 +6505,20 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
 	 */
 	conn_state = drm_atomic_get_connector_state(state, connector);
 
-	ret = PTR_ERR_OR_ZERO(conn_state);
-	if (ret)
+	/* Check for error in getting connector state */
+	if (IS_ERR(conn_state)) {
+		ret = PTR_ERR(conn_state);
 		goto out;
+	}
 
 	/* Attach crtc to drm_atomic_state*/
 	crtc_state = drm_atomic_get_crtc_state(state, &disconnected_acrtc->base);
 
-	ret = PTR_ERR_OR_ZERO(crtc_state);
-	if (ret)
+	/* Check for error in getting crtc state */
+	if (IS_ERR(crtc_state)) {
+		ret = PTR_ERR(crtc_state);
 		goto out;
+	}
 
 	/* force a restore */
 	crtc_state->mode_changed = true;
@@ -6522,9 +6526,11 @@ static int dm_force_atomic_commit(struct drm_connector *connector)
 	/* Attach plane to drm_atomic_state */
 	plane_state = drm_atomic_get_plane_state(state, plane);
 
-	ret = PTR_ERR_OR_ZERO(plane_state);
-	if (ret)
+	/* Check for error in getting plane state */
+	if (IS_ERR(plane_state)) {
+		ret = PTR_ERR(plane_state);
 		goto out;
+	}
 
 	/* Call commit internally with the state we just constructed */
 	ret = drm_atomic_commit(state);
drivers/gpu/drm/amd/display/dc/dcn20/Makefile +1 -1
index 63f3bddba7da..9b5da78a950d 100644
@@ -10,7 +10,7 @@ ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
 DCN20 += dcn20_dsc.o
 endif
 
-CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse
+CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := $(if $(CONFIG_CC_IS_GCC), -mhard-float) -msse
 
 ifdef CONFIG_CC_IS_GCC
 ifeq ($(call cc-ifversion, -lt, 0701, y), y)
drivers/gpu/drm/amd/display/dc/dcn21/Makefile +1 -1
index ff50ae71fe27..a73dd11654de 100644
@@ -3,7 +3,7 @@
 
 DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o
 
-CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse
+CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := $(if $(CONFIG_CC_IS_GCC), -mhard-float) -msse
 
 ifdef CONFIG_CC_IS_GCC
 ifeq ($(call cc-ifversion, -lt, 0701, y), y)
drivers/gpu/drm/amd/display/dc/dml/Makefile +2 -1
index 8df251626e22..26cb8f78f516 100644
@@ -24,7 +24,8 @@
 # It provides the general basic services required by other DAL
 # subcomponents.
 
-dml_ccflags := -mhard-float -msse
+dml_ccflags-$(CONFIG_CC_IS_GCC) := -mhard-float
+dml_ccflags := $(dml_ccflags-y) -msse
 
 ifdef CONFIG_CC_IS_GCC
 ifeq ($(call cc-ifversion, -lt, 0701, y), y)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +2 -3
index df606a567566..234c0bd38e85 100644
@@ -1735,10 +1735,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
 		 * that we can get the current state of the GPIO.
 		 */
 		dp->irq = gpiod_to_irq(dp->hpd_gpiod);
-		irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
+		irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_NO_AUTOEN;
 	} else {
 		dp->irq = platform_get_irq(pdev, 0);
-		irq_flags = 0;
+		irq_flags = IRQF_NO_AUTOEN;
 	}
 
 	if (dp->irq == -ENXIO) {
@@ -1755,7 +1755,6 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
 		dev_err(&pdev->dev, "failed to request irq\n");
 		goto err_disable_clk;
 	}
-	disable_irq(dp->irq);
 
 	return dp;
 
drivers/gpu/drm/msm/adreno/a6xx_hfi.c +1 -1
index eda11abc5f01..d43719622545 100644
@@ -88,7 +88,7 @@ static int a6xx_hfi_wait_for_ack(struct a6xx_gmu *gmu, u32 id, u32 seqnum,
 
 	/* Wait for a response */
 	ret = gmu_poll_timeout(gmu, REG_A6XX_GMU_GMU2HOST_INTR_INFO, val,
-		val & A6XX_GMU_GMU2HOST_INTR_INFO_MSGQ, 100, 5000);
+		val & A6XX_GMU_GMU2HOST_INTR_INFO_MSGQ, 100, 1000000);
 
 	if (ret) {
 		DRM_DEV_ERROR(gmu->dev,
drivers/gpu/drm/msm/hdmi/hdmi_i2c.c +12 -2
index de182c004843..9c78c6c528be 100644
@@ -107,11 +107,15 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c,
 	if (num == 0)
 		return num;
 
+	ret = pm_runtime_resume_and_get(&hdmi->pdev->dev);
+	if (ret)
+		return ret;
+
 	init_ddc(hdmi_i2c);
 
 	ret = ddc_clear_irq(hdmi_i2c);
 	if (ret)
-		return ret;
+		goto fail;
 
 	for (i = 0; i < num; i++) {
 		struct i2c_msg *p = &msgs[i];
@@ -169,7 +173,7 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c,
 				hdmi_read(hdmi, REG_HDMI_DDC_SW_STATUS),
 				hdmi_read(hdmi, REG_HDMI_DDC_HW_STATUS),
 				hdmi_read(hdmi, REG_HDMI_DDC_INT_CTRL));
-		return ret;
+		goto fail;
 	}
 
 	ddc_status = hdmi_read(hdmi, REG_HDMI_DDC_SW_STATUS);
@@ -202,7 +206,13 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c,
 		}
 	}
 
+	pm_runtime_put(&hdmi->pdev->dev);
+
 	return i;
+
+fail:
+	pm_runtime_put(&hdmi->pdev->dev);
+	return ret;
 }
 
 static u32 msm_hdmi_i2c_func(struct i2c_adapter *adapter)
drivers/gpu/drm/nouveau/nouveau_backlight.c +1 -1
index f2f3280c3a50..171cc170c458 100644
@@ -40,7 +40,7 @@
 #include "nouveau_connector.h"
 
 static struct ida bl_ida;
-#define BL_NAME_SIZE 15 // 12 for name + 2 for digits + 1 for '\0'
+#define BL_NAME_SIZE 24 // 12 for name + 11 for digits + 1 for '\0'
 
 struct nouveau_backlight {
 	struct backlight_device *dev;
drivers/gpu/drm/rcar-du/rcar_du_kms.c +4 -6
index 2dc9caee8767..97c5b137add8 100644
@@ -567,7 +567,7 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
 		ret = of_parse_phandle_with_fixed_args(np, "vsps", cells, i,
 						       &args);
 		if (ret < 0)
-			goto error;
+			goto done;
 
 		/*
 		 * Add the VSP to the list or update the corresponding existing
@@ -601,13 +601,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
 		vsp->dev = rcdu;
 
 		ret = rcar_du_vsp_init(vsp, vsps[i].np, vsps[i].crtcs_mask);
-		if (ret < 0)
-			goto error;
+		if (ret)
+			goto done;
 	}
 
-	return 0;
-
-error:
+done:
 	for (i = 0; i < ARRAY_SIZE(vsps); ++i)
 		of_node_put(vsps[i].np);
 
drivers/gpu/drm/tegra/rgb.c +13 -1
index 4be4dfd4a68a..a2168866f552 100644
@@ -211,6 +211,11 @@ static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = {
 	.atomic_check = tegra_rgb_encoder_atomic_check,
 };
 
+static void tegra_dc_of_node_put(void *data)
+{
+	of_node_put(data);
+}
+
 int tegra_dc_rgb_probe(struct tegra_dc *dc)
 {
 	struct device_node *np;
@@ -218,7 +223,14 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)
 	int err;
 
 	np = of_get_child_by_name(dc->dev->of_node, "rgb");
-	if (!np || !of_device_is_available(np))
+	if (!np)
+		return -ENODEV;
+
+	err = devm_add_action_or_reset(dc->dev, tegra_dc_of_node_put, np);
+	if (err < 0)
+		return err;
+
+	if (!of_device_is_available(np))
 		return -ENODEV;
 
 	rgb = devm_kzalloc(dc->dev, sizeof(*rgb), GFP_KERNEL);
drivers/gpu/drm/vkms/vkms_crtc.c +1 -1
index 8b01fae65f43..1b797156cf87 100644
@@ -187,7 +187,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
 		i++;
 	}
 
-	vkms_state->active_planes = kcalloc(i, sizeof(plane), GFP_KERNEL);
+	vkms_state->active_planes = kcalloc(i, sizeof(*vkms_state->active_planes), GFP_KERNEL);
 	if (!vkms_state->active_planes)
 		return -ENOMEM;
 	vkms_state->num_active_planes = i;
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +26 -0
index 8db3b3ddbb64..0d29fe6f6035 100644
@@ -3621,6 +3621,23 @@ static int vmw_execbuf_tie_context(struct vmw_private *dev_priv,
 	return 0;
 }
 
+/*
+ * DMA fence callback to remove a seqno_waiter
+ */
+struct seqno_waiter_rm_context {
+	struct dma_fence_cb base;
+	struct vmw_private *dev_priv;
+};
+
+static void seqno_waiter_rm_cb(struct dma_fence *f, struct dma_fence_cb *cb)
+{
+	struct seqno_waiter_rm_context *ctx =
+		container_of(cb, struct seqno_waiter_rm_context, base);
+
+	vmw_seqno_waiter_remove(ctx->dev_priv);
+	kfree(ctx);
+}
+
 int vmw_execbuf_process(struct drm_file *file_priv,
 			struct vmw_private *dev_priv,
 			void __user *user_commands, void *kernel_commands,
@@ -3814,6 +3831,15 @@ int vmw_execbuf_process(struct drm_file *file_priv,
 		} else {
 			/* Link the fence with the FD created earlier */
 			fd_install(out_fence_fd, sync_file->file);
+			struct seqno_waiter_rm_context *ctx =
+				kmalloc(sizeof(*ctx), GFP_KERNEL);
+			ctx->dev_priv = dev_priv;
+			vmw_seqno_waiter_add(dev_priv);
+			if (dma_fence_add_callback(&fence->base, &ctx->base,
+						   seqno_waiter_rm_cb) < 0) {
+				vmw_seqno_waiter_remove(dev_priv);
+				kfree(ctx);
+			}
 		}
 	}
 
drivers/hid/hid-hyperv.c +3 -2
index 5928e934d734..f9eb7ebec76f 100644
@@ -197,7 +197,8 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
 	if (!input_device->hid_desc)
 		goto cleanup;
 
-	input_device->report_desc_size = desc->desc[0].wDescriptorLength;
+	input_device->report_desc_size = le16_to_cpu(
+					desc->rpt_desc.wDescriptorLength);
 	if (input_device->report_desc_size == 0) {
 		input_device->dev_info_status = -EINVAL;
 		goto cleanup;
@@ -213,7 +214,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
 
 	memcpy(input_device->report_desc,
 	       ((unsigned char *)desc) + desc->bLength,
-	       desc->desc[0].wDescriptorLength);
+	       le16_to_cpu(desc->rpt_desc.wDescriptorLength));
 
 	/* Send the ack */
 	memset(&ack, 0, sizeof(struct mousevsc_prt_msg));
drivers/hid/usbhid/hid-core.c +14 -11
index 8537fcdb456d..6e5770b8cc4c 100644
@@ -984,12 +984,11 @@ static int usbhid_parse(struct hid_device *hid)
 	struct usb_host_interface *interface = intf->cur_altsetting;
 	struct usb_device *dev = interface_to_usbdev (intf);
 	struct hid_descriptor *hdesc;
+	struct hid_class_descriptor *hcdesc;
 	u32 quirks = 0;
 	unsigned int rsize = 0;
 	char *rdesc;
-	int ret, n;
-	int num_descriptors;
-	size_t offset = offsetof(struct hid_descriptor, desc);
+	int ret;
 
 	quirks = hid_lookup_quirk(hid);
 
@@ -1011,20 +1010,19 @@ static int usbhid_parse(struct hid_device *hid)
 		return -ENODEV;
 	}
 
-	if (hdesc->bLength < sizeof(struct hid_descriptor)) {
-		dbg_hid("hid descriptor is too short\n");
+	if (!hdesc->bNumDescriptors ||
+	    hdesc->bLength != sizeof(*hdesc) +
+			      (hdesc->bNumDescriptors - 1) * sizeof(*hcdesc)) {
+		dbg_hid("hid descriptor invalid, bLen=%hhu bNum=%hhu\n",
+			hdesc->bLength, hdesc->bNumDescriptors);
 		return -EINVAL;
 	}
 
 	hid->version = le16_to_cpu(hdesc->bcdHID);
 	hid->country = hdesc->bCountryCode;
 
-	num_descriptors = min_t(int, hdesc->bNumDescriptors,
-	       (hdesc->bLength - offset) / sizeof(struct hid_class_descriptor));
-
-	for (n = 0; n < num_descriptors; n++)
-		if (hdesc->desc[n].bDescriptorType == HID_DT_REPORT)
-			rsize = le16_to_cpu(hdesc->desc[n].wDescriptorLength);
+	if (hdesc->rpt_desc.bDescriptorType == HID_DT_REPORT)
+		rsize = le16_to_cpu(hdesc->rpt_desc.wDescriptorLength);
 
 	if (!rsize || rsize > HID_MAX_DESCRIPTOR_SIZE) {
 		dbg_hid("weird size of report descriptor (%u)\n", rsize);
@@ -1052,6 +1050,11 @@ static int usbhid_parse(struct hid_device *hid)
 		goto err;
 	}
 
+	if (hdesc->bNumDescriptors > 1)
+		hid_warn(intf,
+			"%u unsupported optional hid class descriptors\n",
+			(int)(hdesc->bNumDescriptors - 1));
+
 	hid->quirks |= quirks;
 
 	return 0;
drivers/hwmon/occ/common.c +13 -15
index 0b689ccbb793..16fe4bebe2d4 100644
@@ -406,12 +406,10 @@ static ssize_t occ_show_power_1(struct device *dev,
 	return snprintf(buf, PAGE_SIZE - 1, "%llu\n", val);
 }
 
-static u64 occ_get_powr_avg(u64 *accum, u32 *samples)
+static u64 occ_get_powr_avg(u64 accum, u32 samples)
 {
-	u64 divisor = get_unaligned_be32(samples);
-
-	return (divisor == 0) ? 0 :
-		div64_u64(get_unaligned_be64(accum) * 1000000ULL, divisor);
+	return (samples == 0) ? 0 :
+		mul_u64_u32_div(accum, 1000000UL, samples);
 }
 
 static ssize_t occ_show_power_2(struct device *dev,
@@ -436,8 +434,8 @@ static ssize_t occ_show_power_2(struct device *dev,
 				get_unaligned_be32(&power->sensor_id),
 				power->function_id, power->apss_channel);
 	case 1:
-		val = occ_get_powr_avg(&power->accumulator,
-				       &power->update_tag);
+		val = occ_get_powr_avg(get_unaligned_be64(&power->accumulator),
+				       get_unaligned_be32(&power->update_tag));
 		break;
 	case 2:
 		val = (u64)get_unaligned_be32(&power->update_tag) *
@@ -474,8 +472,8 @@ static ssize_t occ_show_power_a0(struct device *dev,
 		return snprintf(buf, PAGE_SIZE - 1, "%u_system\n",
 				get_unaligned_be32(&power->sensor_id));
 	case 1:
-		val = occ_get_powr_avg(&power->system.accumulator,
-				       &power->system.update_tag);
+		val = occ_get_powr_avg(get_unaligned_be64(&power->system.accumulator),
+				       get_unaligned_be32(&power->system.update_tag));
 		break;
 	case 2:
 		val = (u64)get_unaligned_be32(&power->system.update_tag) *
@@ -488,8 +486,8 @@ static ssize_t occ_show_power_a0(struct device *dev,
 		return snprintf(buf, PAGE_SIZE - 1, "%u_proc\n",
 				get_unaligned_be32(&power->sensor_id));
 	case 5:
-		val = occ_get_powr_avg(&power->proc.accumulator,
-				       &power->proc.update_tag);
+		val = occ_get_powr_avg(get_unaligned_be64(&power->proc.accumulator),
+				       get_unaligned_be32(&power->proc.update_tag));
 		break;
 	case 6:
 		val = (u64)get_unaligned_be32(&power->proc.update_tag) *
@@ -502,8 +500,8 @@ static ssize_t occ_show_power_a0(struct device *dev,
 		return snprintf(buf, PAGE_SIZE - 1, "%u_vdd\n",
 				get_unaligned_be32(&power->sensor_id));
 	case 9:
-		val = occ_get_powr_avg(&power->vdd.accumulator,
-				       &power->vdd.update_tag);
+		val = occ_get_powr_avg(get_unaligned_be64(&power->vdd.accumulator),
+				       get_unaligned_be32(&power->vdd.update_tag));
 		break;
 	case 10:
 		val = (u64)get_unaligned_be32(&power->vdd.update_tag) *
@@ -516,8 +514,8 @@ static ssize_t occ_show_power_a0(struct device *dev,
 		return snprintf(buf, PAGE_SIZE - 1, "%u_vdn\n",
 				get_unaligned_be32(&power->sensor_id));
 	case 13:
-		val = occ_get_powr_avg(&power->vdn.accumulator,
-				       &power->vdn.update_tag);
+		val = occ_get_powr_avg(get_unaligned_be64(&power->vdn.accumulator),
+				       get_unaligned_be32(&power->vdn.update_tag));
 		break;
 	case 14:
 		val = (u64)get_unaligned_be32(&power->vdn.update_tag) *
drivers/i2c/busses/i2c-designware-slave.c +1 -1
index f5f001738df5..57e67962a602 100644
@@ -96,7 +96,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave)
 	dev->disable(dev);
 	synchronize_irq(dev->irq);
 	dev->slave = NULL;
-	pm_runtime_put(dev->dev);
+	pm_runtime_put_sync_suspend(dev->dev);
 
 	return 0;
 }
drivers/iio/adc/ad7606_spi.c +1 -1
index e9f4043966ae..0798ac74d972 100644
@@ -151,7 +151,7 @@ static int ad7606_spi_reg_write(struct ad7606_state *st,
 	struct spi_device *spi = to_spi_device(st->dev);
 
 	st->d16[0] = cpu_to_be16((st->bops->rd_wr_cmd(addr, 1) << 8) |
-				  (val & 0x1FF));
+				  (val & 0xFF));
 
 	return spi_write(spi, &st->d16[0], sizeof(st->d16[0]));
 }
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0 -1
index 28bbc4708fd4..f494a571c7a5 100644
@@ -41,7 +41,6 @@
 #include <rdma/ib_umem.h>
 #include <rdma/uverbs_ioctl.h>
 
-#include "hnae3.h"
 #include "hns_roce_common.h"
 #include "hns_roce_device.h"
 #include "hns_roce_cmd.h"
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -0
index b9ab3ca3079c..45eac5db3314 100644
@@ -34,6 +34,7 @@
 #define _HNS_ROCE_HW_V2_H
 
 #include <linux/bitops.h>
+#include "hnae3.h"
 
 #define HNS_ROCE_VF_QPC_BT_NUM			256
 #define HNS_ROCE_VF_SCCC_BT_NUM			64
drivers/infiniband/hw/hns/hns_roce_restrack.c +0 -1
index 39c08217e861..2ac0359a647b 100644
@@ -4,7 +4,6 @@
 #include <rdma/rdma_cm.h>
 #include <rdma/restrack.h>
 #include <uapi/rdma/rdma_netlink.h>
-#include "hnae3.h"
 #include "hns_roce_common.h"
 #include "hns_roce_device.h"
 #include "hns_roce_hw_v2.h"
drivers/input/misc/ims-pcu.c +6 -0
index 4dfed127952d..6e02a33ec379 100644
@@ -845,6 +845,12 @@ static int ims_pcu_flash_firmware(struct ims_pcu *pcu,
 		addr = be32_to_cpu(rec->addr) / 2;
 		len = be16_to_cpu(rec->len);
 
+		if (len > sizeof(pcu->cmd_buf) - 1 - sizeof(*fragment)) {
+			dev_err(pcu->dev,
+				"Invalid record length in firmware: %d\n", len);
+			return -EINVAL;
+		}
+
 		fragment = (void *)&pcu->cmd_buf[1];
 		put_unaligned_le32(addr, &fragment->addr);
 		fragment->len = len;
drivers/input/misc/sparcspkr.c +16 -6
index cdcb7737c46a..b6549f44a67b 100644
@@ -74,9 +74,14 @@ static int bbc_spkr_event(struct input_dev *dev, unsigned int type, unsigned int
 		return -1;
 
 	switch (code) {
-		case SND_BELL: if (value) value = 1000;
-		case SND_TONE: break;
-		default: return -1;
+	case SND_BELL:
+		if (value)
+			value = 1000;
+		break;
+	case SND_TONE:
+		break;
+	default:
+		return -1;
 	}
 
 	if (value > 20 && value < 32767)
@@ -112,9 +117,14 @@ static int grover_spkr_event(struct input_dev *dev, unsigned int type, unsigned
 		return -1;
 
 	switch (code) {
-		case SND_BELL: if (value) value = 1000;
-		case SND_TONE: break;
-		default: return -1;
+	case SND_BELL:
+		if (value)
+			value = 1000;
+		break;
+	case SND_TONE:
+		break;
+	default:
+		return -1;
 	}
 
 	if (value > 20 && value < 32767)
drivers/input/rmi4/rmi_f34.c +77 -60

213 lines not on this page · raw message

drivers/md/dm-raid1.c +2 -3
index 089aed57e083..033b600e74e7 100644
@@ -128,10 +128,9 @@ static void queue_bio(struct mirror_set *ms, struct bio *bio, int rw)
 	spin_lock_irqsave(&ms->lock, flags);
 	should_wake = !(bl->head);
 	bio_list_add(bl, bio);
-	spin_unlock_irqrestore(&ms->lock, flags);
-
 	if (should_wake)
 		wakeup_mirrord(ms);
+	spin_unlock_irqrestore(&ms->lock, flags);
 }
 
 static void dispatch_bios(void *context, struct bio_list *bio_list)
@@ -638,9 +637,9 @@ static void write_callback(unsigned long error, void *context)
 	if (!ms->failures.head)
 		should_wake = 1;
 	bio_list_add(&ms->failures, bio);
-	spin_unlock_irqrestore(&ms->lock, flags);
 	if (should_wake)
 		wakeup_mirrord(ms);
+	spin_unlock_irqrestore(&ms->lock, flags);
 }
 
 static void do_write(struct mirror_set *ms, struct bio *bio)
drivers/media/i2c/tc358743.c +4 -0
index f042570bc5ca..f4ebe93a495c 100644
@@ -309,6 +309,10 @@ static int tc358743_get_detected_timings(struct v4l2_subdev *sd,
 
 	memset(timings, 0, sizeof(struct v4l2_dv_timings));
 
+	/* if HPD is low, ignore any video */
+	if (!(i2c_rd8(sd, HPD_CTL) & MASK_HPD_OUT0))
+		return -ENOLINK;
+
 	if (no_signal(sd)) {
 		v4l2_dbg(1, debug, sd, "%s: no valid signal\n", __func__);
 		return -ENOLINK;
drivers/media/platform/exynos4-is/fimc-is-regs.c +1 -0
index 366e6393817d..5f9c44e825a5 100644
@@ -164,6 +164,7 @@ int fimc_is_hw_change_mode(struct fimc_is *is)
 	if (WARN_ON(is->config_index >= ARRAY_SIZE(cmd)))
 		return -EINVAL;
 
+	fimc_is_hw_wait_intmsr0_intmsd0(is);
 	mcuctl_write(cmd[is->config_index], is, MCUCTL_REG_ISSR(0));
 	mcuctl_write(is->sensor_index, is, MCUCTL_REG_ISSR(1));
 	mcuctl_write(is->setfile.sub_index, is, MCUCTL_REG_ISSR(2));
drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c +4 -3
index 5a47dcbf1c8e..303b055fefea 100644
@@ -520,12 +520,13 @@ static int hdcs_init(struct sd *sd)
 static int hdcs_dump(struct sd *sd)
 {
 	u16 reg, val;
+	int err = 0;
 
 	pr_info("Dumping sensor registers:\n");
 
-	for (reg = HDCS_IDENT; reg <= HDCS_ROWEXPH; reg++) {
-		stv06xx_read_sensor(sd, reg, &val);
+	for (reg = HDCS_IDENT; reg <= HDCS_ROWEXPH && !err; reg++) {
+		err = stv06xx_read_sensor(sd, reg, &val);
 		pr_info("reg 0x%02x = 0x%02x\n", reg, val);
 	}
-	return 0;
+	return (err < 0) ? err : 0;
 }
drivers/media/v4l2-core/v4l2-dev.c +7 -7
index d9ddb1ddc150..a8fb26483def 100644
@@ -1010,25 +1010,25 @@ int __video_register_device(struct video_device *vdev,
 	vdev->dev.class = &video_class;
 	vdev->dev.devt = MKDEV(VIDEO_MAJOR, vdev->minor);
 	vdev->dev.parent = vdev->dev_parent;
+	vdev->dev.release = v4l2_device_release;
 	dev_set_name(&vdev->dev, "%s%d", name_base, vdev->num);
+
+	/* Increase v4l2_device refcount */
+	v4l2_device_get(vdev->v4l2_dev);
+
 	mutex_lock(&videodev_lock);
 	ret = device_register(&vdev->dev);
 	if (ret < 0) {
 		mutex_unlock(&videodev_lock);
 		pr_err("%s: device_register failed\n", __func__);
-		goto cleanup;
+		put_device(&vdev->dev);
+		return ret;
 	}
-	/* Register the release callback that will be called when the last
-	   reference to the device goes away. */
-	vdev->dev.release = v4l2_device_release;
 
 	if (nr != -1 && nr != vdev->num && warn_if_nr_in_use)
 		pr_warn("%s: requested %s%d, got %s\n", __func__,
 			name_base, nr, video_device_node_name(vdev));
 
-	/* Increase v4l2_device refcount */
-	v4l2_device_get(vdev->v4l2_dev);
-
 	/* Part 5: Register the entity. */
 	ret = video_register_media_controller(vdev);
 
drivers/mfd/exynos-lpass.c +0 -1
index 99bd0e73c19c..ffda3445d1c0 100644
@@ -144,7 +144,6 @@ static int exynos_lpass_remove(struct platform_device *pdev)
 {
 	struct exynos_lpass *lpass = platform_get_drvdata(pdev);
 
-	exynos_lpass_disable(lpass);
 	pm_runtime_disable(&pdev->dev);
 	if (!pm_runtime_status_suspended(&pdev->dev))
 		exynos_lpass_disable(lpass);
drivers/mfd/stmpe-spi.c +1 -1
index 7351734f7593..07fa56e5337d 100644
@@ -129,7 +129,7 @@ static const struct spi_device_id stmpe_spi_id[] = {
 	{ "stmpe2403", STMPE2403 },
 	{ }
 };
-MODULE_DEVICE_TABLE(spi, stmpe_id);
+MODULE_DEVICE_TABLE(spi, stmpe_spi_id);
 
 static struct spi_driver stmpe_spi_driver = {
 	.driver = {
drivers/mtd/nand/raw/sunxi_nand.c +2 -0
index 0f3bce3fb00b..0df221a55856 100644
@@ -818,6 +818,7 @@ static int sunxi_nfc_hw_ecc_read_chunk(struct nand_chip *nand,
 	if (ret)
 		return ret;
 
+	sunxi_nfc_randomizer_config(nand, page, false);
 	sunxi_nfc_randomizer_enable(nand);
 	writel(NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD | NFC_ECC_OP,
 	       nfc->regs + NFC_REG_CMD);
@@ -1045,6 +1046,7 @@ static int sunxi_nfc_hw_ecc_write_chunk(struct nand_chip *nand,
 	if (ret)
 		return ret;
 
+	sunxi_nfc_randomizer_config(nand, page, false);
 	sunxi_nfc_randomizer_enable(nand);
 	sunxi_nfc_hw_ecc_set_prot_oob_bytes(nand, oob, 0, bbm, page);
 
drivers/net/ethernet/cadence/macb_main.c +5 -1
index a750c752846c..a635c9af26c3 100644
@@ -4320,7 +4320,11 @@ static int macb_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 	if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {
-		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
+		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
+		if (err) {
+			dev_err(&pdev->dev, "failed to set DMA mask\n");
+			goto err_out_free_netdev;
+		}
 		bp->hw_dma_cap |= HW_DMA_CAP_64B;
 	}
 #endif
drivers/net/ethernet/dlink/dl2k.c +13 -1
index eb2315764134..8d57fb507205 100644
@@ -155,6 +155,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
 	np->ioaddr = ioaddr;
 	np->chip_id = chip_idx;
 	np->pdev = pdev;
+
+	spin_lock_init(&np->stats_lock);
 	spin_lock_init (&np->tx_lock);
 	spin_lock_init (&np->rx_lock);
 
@@ -875,7 +877,6 @@ tx_error (struct net_device *dev, int tx_status)
 	frame_id = (tx_status & 0xffff0000);
 	printk (KERN_ERR "%s: Transmit error, TxStatus %4.4x, FrameId %d.\n",
 		dev->name, tx_status, frame_id);
-	dev->stats.tx_errors++;
 	/* Ttransmit Underrun */
 	if (tx_status & 0x10) {
 		dev->stats.tx_fifo_errors++;
@@ -912,9 +913,15 @@ tx_error (struct net_device *dev, int tx_status)
 		rio_set_led_mode(dev);
 		/* Let TxStartThresh stay default value */
 	}
+
+	spin_lock(&np->stats_lock);
 	/* Maximum Collisions */
 	if (tx_status & 0x08)
 		dev->stats.collisions++;
+
+	dev->stats.tx_errors++;
+	spin_unlock(&np->stats_lock);
+
 	/* Restart the Tx */
 	dw32(MACCtrl, dr16(MACCtrl) | TxEnable);
 }
@@ -1084,7 +1091,9 @@ get_stats (struct net_device *dev)
 	int i;
 #endif
 	unsigned int stat_reg;
+	unsigned long flags;
 
+	spin_lock_irqsave(&np->stats_lock, flags);
 	/* All statistics registers need to be acknowledged,
 	   else statistic overflow could cause problems */
 
@@ -1134,6 +1143,9 @@ get_stats (struct net_device *dev)
 	dr16(TCPCheckSumErrors);
 	dr16(UDPCheckSumErrors);
 	dr16(IPCheckSumErrors);
+
+	spin_unlock_irqrestore(&np->stats_lock, flags);
+
 	return &dev->stats;
 }
 
drivers/net/ethernet/dlink/dl2k.h +2 -0
index 0e33e2eaae96..56aff2f0bdbf 100644
@@ -372,6 +372,8 @@ struct netdev_private {
 	struct pci_dev *pdev;
 	void __iomem *ioaddr;
 	void __iomem *eeprom_addr;
+	// To ensure synchronization when stats are updated.
+	spinlock_t stats_lock;
 	spinlock_t tx_lock;
 	spinlock_t rx_lock;
 	unsigned int rx_buf_sz;		/* Based on MTU+slack. */
drivers/net/ethernet/emulex/benet/be_cmds.c +1 -1
index 9812a9a5d033..d9bceb26f4e5 100644
@@ -1608,7 +1608,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
 	/* version 1 of the cmd is not supported only by BE2 */
 	if (BE2_chip(adapter))
 		hdr->version = 0;
-	if (BE3_chip(adapter) || lancer_chip(adapter))
+	else if (BE3_chip(adapter) || lancer_chip(adapter))
 		hdr->version = 1;
 	else
 		hdr->version = 2;
drivers/net/ethernet/intel/i40e/i40e_common.c +4 -3
index a3709c4fc65d..e4aa2a2d50e5 100644
@@ -1322,10 +1322,11 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw)
 void i40e_clear_hw(struct i40e_hw *hw)
 {
 	u32 num_queues, base_queue;
-	u32 num_pf_int;
-	u32 num_vf_int;
+	s32 num_pf_int;
+	s32 num_vf_int;
 	u32 num_vfs;
-	u32 i, j;
+	s32 i;
+	u32 j;
 	u32 val;
 	u32 eol = 0x7ff;
 
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +7 -4
index 81f428d0b7a4..d8ba40912203 100644
@@ -1456,8 +1456,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf)
  * @vf: pointer to the VF structure
  * @flr: VFLR was issued or not
  *
- * Returns true if the VF is in reset, resets successfully, or resets
- * are disabled and false otherwise.
+ * Return: True if reset was performed successfully or if resets are disabled.
+ * False if reset is already in progress.
  **/
 bool i40e_reset_vf(struct i40e_vf *vf, bool flr)
 {
@@ -1476,7 +1476,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr)
 
 	/* If VF is being reset already we don't need to continue. */
 	if (test_and_set_bit(I40E_VF_STATE_RESETTING, &vf->vf_states))
-		return true;
+		return false;
 
 	i40e_trigger_vf_reset(vf, flr);
 
@@ -4125,7 +4125,10 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
 		reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx));
 		if (reg & BIT(bit_idx))
 			/* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */
-			i40e_reset_vf(vf, true);
+			if (!i40e_reset_vf(vf, true)) {
+				/* At least one VF did not finish resetting, retry next time */
+				set_bit(__I40E_VFLR_EVENT_PENDING, pf->state);
+			}
 	}
 
 	return 0;
drivers/net/ethernet/intel/ice/ice_sched.c +6 -5
index d1c0ccee879b..c6c96d3ee9cc 100644
@@ -1188,16 +1188,16 @@ ice_sched_get_vsi_node(struct ice_hw *hw, struct ice_sched_node *tc_node,
 /**
  * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes
  * @hw: pointer to the HW struct
- * @num_qs: number of queues
+ * @num_new_qs: number of new queues that will be added to the tree
  * @num_nodes: num nodes array
  *
  * This function calculates the number of VSI child nodes based on the
  * number of queues.
  */
 static void
-ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)
+ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_new_qs, u16 *num_nodes)
 {
-	u16 num = num_qs;
+	u16 num = num_new_qs;
 	u8 i, qgl, vsil;
 
 	qgl = ice_sched_get_qgrp_layer(hw);
@@ -1438,8 +1438,9 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,
 	if (status)
 		return status;
 
-	if (new_numqs)
-		ice_sched_calc_vsi_child_nodes(hw, new_numqs, new_num_nodes);
+	ice_sched_calc_vsi_child_nodes(hw, new_numqs - prev_numqs,
+				       new_num_nodes);
+
 	/* Keep the max number of queue configuration all the time. Update the
 	 * tree only if number of queues > previous number of queues. This may
 	 * leave some extra nodes in the tree if number of queues < previous
drivers/net/ethernet/mellanox/mlx4/en_clock.c +1 -1
index 024788549c25..060698b0c65c 100644
@@ -251,7 +251,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = {
 static u32 freq_to_shift(u16 freq)
 {
 	u32 freq_khz = freq * 1000;
-	u64 max_val_cycles = freq_khz * 1000 * MLX4_EN_WRAP_AROUND_SEC;
+	u64 max_val_cycles = freq_khz * 1000ULL * MLX4_EN_WRAP_AROUND_SEC;
 	u64 max_val_cycles_rounded = 1ULL << fls64(max_val_cycles - 1);
 	/* calculate max possible multiplier in order to fit in 64bit */
 	u64 max_mul = div64_u64(ULLONG_MAX, max_val_cycles_rounded);
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +1 -0
index b711148a9d50..9dbdd6266f73 100644
@@ -1889,6 +1889,7 @@ static int mlx4_en_get_ts_info(struct net_device *dev,
 	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) {
 		info->so_timestamping |=
 			SOF_TIMESTAMPING_TX_HARDWARE |
+			SOF_TIMESTAMPING_TX_SOFTWARE |
 			SOF_TIMESTAMPING_RX_HARDWARE |
 			SOF_TIMESTAMPING_RAW_HARDWARE;
 
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +9 -4
index 30d5b7f52a2a..22318edff551 100644
@@ -1716,6 +1716,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,
 	struct mlx5_flow_handle *rule;
 	struct match_list *iter;
 	bool take_write = false;
+	bool try_again = false;
 	struct fs_fte *fte;
 	u64  version;
 	int err;
@@ -1768,11 +1769,14 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,
 	list_for_each_entry(iter, match_head, list) {
 		g = iter->g;
 
-		if (!g->node.active)
-			continue;
-
 		nested_down_write_ref_node(&g->node, FS_LOCK_PARENT);
 
+		if (!g->node.active) {
+			try_again = true;
+			up_write_ref_node(&g->node, false);
+			continue;
+		}
+
 		err = insert_fte(g, fte);
 		if (err) {
 			up_write_ref_node(&g->node, false);
@@ -1790,7 +1794,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,
 			tree_put_node(&fte->node, false);
 		return rule;
 	}
-	rule = ERR_PTR(-ENOENT);
+	err = try_again ? -EAGAIN : -ENOENT;
+	rule = ERR_PTR(err);
 out:
 	kmem_cache_free(steering->ftes_cache, fte);
 	return rule;
drivers/net/ethernet/microchip/lan743x_main.c +2 -2
index a69a34d93ad6..22e1143c5846 100644
@@ -912,7 +912,7 @@ static int lan743x_mac_set_mtu(struct lan743x_adapter *adapter, int new_mtu)
 }
 
 /* PHY */
-static int lan743x_phy_reset(struct lan743x_adapter *adapter)
+static int lan743x_hw_reset_phy(struct lan743x_adapter *adapter)
 {
 	u32 data;
 
@@ -946,7 +946,7 @@ static void lan743x_phy_update_flowcontrol(struct lan743x_adapter *adapter,
 
 static int lan743x_phy_init(struct lan743x_adapter *adapter)
 {
-	return lan743x_phy_reset(adapter);
+	return lan743x_hw_reset_phy(adapter);
 }
 
 static void lan743x_phy_link_status_change(struct net_device *netdev)
drivers/net/phy/mdio_bus.c +14 -2
index fdf8221f46fa..931b9a6c5dc5 100644
@@ -565,7 +565,13 @@ int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
 
 	WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock));
 
-	retval = bus->read(bus, addr, regnum);
+	if (addr >= PHY_MAX_ADDR)
+		return -ENXIO;
+
+	if (bus->read)
+		retval = bus->read(bus, addr, regnum);
+	else
+		retval = -EOPNOTSUPP;
 
 	trace_mdio_access(bus, 1, addr, regnum, retval, retval);
 
@@ -590,7 +596,13 @@ int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
 
 	WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock));
 
-	err = bus->write(bus, addr, regnum, val);
+	if (addr >= PHY_MAX_ADDR)
+		return -ENXIO;
+
+	if (bus->write)
+		err = bus->write(bus, addr, regnum, val);
+	else
+		err = -EOPNOTSUPP;
 
 	trace_mdio_access(bus, 0, addr, regnum, val, err);
 
drivers/net/usb/aqc111.c +8 -2
index b958e0005882..c1d4c2dc784a 100644
@@ -30,11 +30,14 @@ static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
 	ret = usbnet_read_cmd_nopm(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR |
 				   USB_RECIP_DEVICE, value, index, data, size);
 
-	if (unlikely(ret < 0))
+	if (unlikely(ret < size)) {
 		netdev_warn(dev->net,
 			    "Failed to read(0x%x) reg index 0x%04x: %d\n",
 			    cmd, index, ret);
 
+		ret = ret < 0 ? ret : -ENODATA;
+	}
+
 	return ret;
 }
 
@@ -46,11 +49,14 @@ static int aqc111_read_cmd(struct usbnet *dev, u8 cmd, u16 value,
 	ret = usbnet_read_cmd(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR |
 			      USB_RECIP_DEVICE, value, index, data, size);
 
-	if (unlikely(ret < 0))
+	if (unlikely(ret < size)) {
 		netdev_warn(dev->net,
 			    "Failed to read(0x%x) reg index 0x%04x: %d\n",
 			    cmd, index, ret);
 
+		ret = ret < 0 ? ret : -ENODATA;
+	}
+
 	return ret;
 }
 
drivers/net/usb/ch9200.c +5 -2
index 6ed8da85b081..a7f7f46b2604 100644
@@ -180,6 +180,7 @@ static int ch9200_mdio_read(struct net_device *netdev, int phy_id, int loc)
 {
 	struct usbnet *dev = netdev_priv(netdev);
 	unsigned char buff[2];
+	int ret;
 
 	netdev_dbg(netdev, "ch9200_mdio_read phy_id:%02x loc:%02x\n",
 		   phy_id, loc);
@@ -187,8 +188,10 @@ static int ch9200_mdio_read(struct net_device *netdev, int phy_id, int loc)
 	if (phy_id != 0)
 		return -ENODEV;
 
-	control_read(dev, REQUEST_READ, 0, loc * 2, buff, 0x02,
-		     CONTROL_TIMEOUT_MS);
+	ret = control_read(dev, REQUEST_READ, 0, loc * 2, buff, 0x02,
+			   CONTROL_TIMEOUT_MS);
+	if (ret < 0)
+		return ret;
 
 	return (buff[0] | buff[1] << 8);
 }
drivers/net/vxlan.c +4 -4
index 7105ac37f341..18844bac9375 100644
@@ -681,10 +681,10 @@ static int vxlan_fdb_append(struct vxlan_fdb *f,
 	if (rd == NULL)
 		return -ENOMEM;
 
-	if (dst_cache_init(&rd->dst_cache, GFP_ATOMIC)) {
-		kfree(rd);
-		return -ENOMEM;
-	}
+	/* The driver can work correctly without a dst cache, so do not treat
+	 * dst cache initialization errors as fatal.
+	 */
+	dst_cache_init(&rd->dst_cache, GFP_ATOMIC | __GFP_NOWARN);
 
 	rd->remote_ip = *ip;
 	rd->remote_port = port;
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c +3 -0
index f20c839aeda2..6db484ee7ee0 100644
@@ -290,6 +290,9 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv,
 	struct ath_common *common = ath9k_hw_common(priv->ah);
 	int slot;
 
+	if (!priv->cur_beacon_conf.enable_beacon)
+		return;
+
 	if (swba->beacon_pending != 0) {
 		priv->beacon.bmisscnt++;
 		if (priv->beacon.bmisscnt > BSTUCK_THRESHOLD) {
drivers/net/wireless/ath/carl9170/usb.c +13 -6
index 98fdfa84b0a9..d5d23b297fd9 100644
@@ -438,14 +438,21 @@ static void carl9170_usb_rx_complete(struct urb *urb)
 
 		if (atomic_read(&ar->rx_anch_urbs) == 0) {
 			/*
-			 * The system is too slow to cope with
-			 * the enormous workload. We have simply
-			 * run out of active rx urbs and this
-			 * unfortunately leads to an unpredictable
-			 * device.
+			 * At this point, either the system is too slow to
+			 * cope with the enormous workload (so we have simply
+			 * run out of active rx urbs and this unfortunately
+			 * leads to an unpredictable device), or the device
+			 * is not fully functional after an unsuccessful
+			 * firmware loading attempts (so it doesn't pass
+			 * ieee80211_register_hw() and there is no internal
+			 * workqueue at all).
 			 */
 
-			ieee80211_queue_work(ar->hw, &ar->ping_work);
+			if (ar->registered)
+				ieee80211_queue_work(ar->hw, &ar->ping_work);
+			else
+				pr_warn_once("device %s is not registered\n",
+					     dev_name(&ar->udev->dev));
 		}
 	} else {
 		/*
drivers/net/wireless/intersil/p54/fwio.c +2 -0
index a5afcc865196..88e4a5b4a3dc 100644
@@ -233,6 +233,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,
 
 	mutex_lock(&priv->eeprom_mutex);
 	priv->eeprom = buf;
+	priv->eeprom_slice_size = len;
 	eeprom_hdr = skb_put(skb, eeprom_hdr_size + len);
 
 	if (priv->fw_var < 0x509) {
@@ -255,6 +256,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,
 		ret = -EBUSY;
 	}
 	priv->eeprom = NULL;
+	priv->eeprom_slice_size = 0;
 	mutex_unlock(&priv->eeprom_mutex);
 	return ret;
 }
drivers/net/wireless/intersil/p54/p54.h +1 -0
index 0a9c1a19380f..9ca3bb3cf3d9 100644
@@ -258,6 +258,7 @@ struct p54_common {
 
 	/* eeprom handling */
 	void *eeprom;
+	size_t eeprom_slice_size;
 	struct completion eeprom_comp;
 	struct mutex eeprom_mutex;
 };
drivers/net/wireless/intersil/p54/txrx.c +9 -4
index 873fea59894f..6333b1000f92 100644
@@ -500,14 +500,19 @@ static void p54_rx_eeprom_readback(struct p54_common *priv,
 		return ;
 
 	if (priv->fw_var >= 0x509) {
-		memcpy(priv->eeprom, eeprom->v2.data,
-		       le16_to_cpu(eeprom->v2.len));
+		if (le16_to_cpu(eeprom->v2.len) != priv->eeprom_slice_size)
+			return;
+
+		memcpy(priv->eeprom, eeprom->v2.data, priv->eeprom_slice_size);
 	} else {
-		memcpy(priv->eeprom, eeprom->v1.data,
-		       le16_to_cpu(eeprom->v1.len));
+		if (le16_to_cpu(eeprom->v1.len) != priv->eeprom_slice_size)
+			return;
+
+		memcpy(priv->eeprom, eeprom->v1.data, priv->eeprom_slice_size);
 	}
 
 	priv->eeprom = NULL;
+	priv->eeprom_slice_size = 0;
 	tmp = p54_find_and_unlink_skb(priv, hdr->req_id);
 	dev_kfree_skb_any(tmp);
 	complete(&priv->eeprom_comp);
drivers/net/wireless/realtek/rtlwifi/pci.c +10 -0
index b16b1f1fb1e0..9339c6d2b258 100644
@@ -155,6 +155,16 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)
 	if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8192SE &&
 	    init_aspm == 0x43)
 		ppsc->support_aspm = false;
+
+	/* RTL8723BE found on some ASUSTek laptops, such as F441U and
+	 * X555UQ with subsystem ID 11ad:1723 are known to output large
+	 * amounts of PCIe AER errors during and after boot up, causing
+	 * heavy lags, poor network throughput, and occasional lock-ups.
+	 */
+	if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8723BE &&
+	    (rtlpci->pdev->subsystem_vendor == 0x11ad &&
+	     rtlpci->pdev->subsystem_device == 0x1723))
+		ppsc->support_aspm = false;
 }
 
 static bool _rtl_pci_platform_switch_device_pci_aspm(
drivers/net/wireless/realtek/rtw88/rtw8822c.c +2 -1
index 72d711a62b07..0cc8d507165a 100644
@@ -2857,7 +2857,8 @@ void rtw8822c_dpk_cal_coef1(struct rtw_dev *rtwdev)
 	rtw_write32(rtwdev, REG_NCTL0, 0x00001148);
 	rtw_write32(rtwdev, REG_NCTL0, 0x00001149);
 
-	check_hw_ready(rtwdev, 0x2d9c, MASKBYTE0, 0x55);
+	if (!check_hw_ready(rtwdev, 0x2d9c, MASKBYTE0, 0x55))
+		rtw_warn(rtwdev, "DPK stuck, performance may be suboptimal");
 
 	rtw_write8(rtwdev, 0x1b10, 0x0);
 	rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x0000000c);
drivers/pci/pci.c +2 -1
index ad5bd17f77a3..050fb376d1c5 100644
@@ -5296,7 +5296,8 @@ static void pci_slot_unlock(struct pci_slot *slot)
 			continue;
 		if (dev->subordinate)
 			pci_bus_unlock(dev->subordinate);
-		pci_dev_unlock(dev);
+		else
+			pci_dev_unlock(dev);
 	}
 }
 
drivers/pci/quirks.c +23 -0
index 080d5077c645..2733ca94434d 100644
@@ -4869,6 +4869,18 @@ static int pci_quirk_brcm_acs(struct pci_dev *dev, u16 acs_flags)
 		PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);
 }
 
+static int pci_quirk_loongson_acs(struct pci_dev *dev, u16 acs_flags)
+{
+	/*
+	 * Loongson PCIe Root Ports don't advertise an ACS capability, but
+	 * they do not allow peer-to-peer transactions between Root Ports.
+	 * Allow each Root Port to be in a separate IOMMU group by masking
+	 * SV/RR/CR/UF bits.
+	 */
+	return pci_acs_ctrl_enabled(acs_flags,
+		PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);
+}
+
 /*
  * Wangxun 40G/25G/10G/1G NICs have no ACS capability, but on
  * multi-function devices, the hardware isolates the functions by
@@ -5002,6 +5014,17 @@ static const struct pci_dev_acs_enabled {
 	{ PCI_VENDOR_ID_BROADCOM, 0x1762, pci_quirk_mf_endpoint_acs },
 	{ PCI_VENDOR_ID_BROADCOM, 0x1763, pci_quirk_mf_endpoint_acs },
 	{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },
+	/* Loongson PCIe Root Ports */
+	{ PCI_VENDOR_ID_LOONGSON, 0x3C09, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x3C19, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x3C29, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A09, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A19, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A29, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A39, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A49, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A59, pci_quirk_loongson_acs },
+	{ PCI_VENDOR_ID_LOONGSON, 0x7A69, pci_quirk_loongson_acs },
 	/* Amazon Annapurna Labs */
 	{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },
 	/* Zhaoxin multi-function devices */
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +21 -14
index 359b2ecfcbdb..46e7e78d3763 100644
@@ -353,9 +353,7 @@ static int armada_37xx_pmx_set_by_name(struct pinctrl_dev *pctldev,
 
 	val = grp->val[func];
 
-	regmap_update_bits(info->regmap, reg, mask, val);
-
-	return 0;
+	return regmap_update_bits(info->regmap, reg, mask, val);
 }
 
 static int armada_37xx_pmx_set(struct pinctrl_dev *pctldev,
@@ -397,10 +395,13 @@ static int armada_37xx_gpio_get_direction(struct gpio_chip *chip,
 	struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);
 	unsigned int reg = OUTPUT_EN;
 	unsigned int val, mask;
+	int ret;
 
 	armada_37xx_update_reg(&reg, &offset);
 	mask = BIT(offset);
-	regmap_read(info->regmap, reg, &val);
+	ret = regmap_read(info->regmap, reg, &val);
+	if (ret)
+		return ret;
 
 	return !(val & mask);
 }
@@ -409,20 +410,22 @@ static int armada_37xx_gpio_direction_output(struct gpio_chip *chip,
 					     unsigned int offset, int value)
 {
 	struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);
-	unsigned int reg = OUTPUT_EN;
+	unsigned int en_offset = offset;
+	unsigned int reg = OUTPUT_VAL;
 	unsigned int mask, val, ret;
 
 	armada_37xx_update_reg(&reg, &offset);
 	mask = BIT(offset);
+	val = value ? mask : 0;
 
-	ret = regmap_update_bits(info->regmap, reg, mask, mask);
-
+	ret = regmap_update_bits(info->regmap, reg, mask, val);
 	if (ret)
 		return ret;
 
-	reg = OUTPUT_VAL;
-	val = value ? mask : 0;
-	regmap_update_bits(info->regmap, reg, mask, val);
+	reg = OUTPUT_EN;
+	armada_37xx_update_reg(&reg, &en_offset);
+
+	regmap_update_bits(info->regmap, reg, mask, mask);
 
 	return 0;
 }
@@ -432,11 +435,14 @@ static int armada_37xx_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);
 	unsigned int reg = INPUT_VAL;
 	unsigned int val, mask;
+	int ret;
 
 	armada_37xx_update_reg(&reg, &offset);
 	mask = BIT(offset);
 
-	regmap_read(info->regmap, reg, &val);
+	ret = regmap_read(info->regmap, reg, &val);
+	if (ret)
+		return ret;
 
 	return (val & mask) != 0;
 }
@@ -461,16 +467,17 @@ static int armada_37xx_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
 {
 	struct armada_37xx_pinctrl *info = pinctrl_dev_get_drvdata(pctldev);
 	struct gpio_chip *chip = range->gc;
+	int ret;
 
 	dev_dbg(info->dev, "gpio_direction for pin %u as %s-%d to %s\n",
 		offset, range->name, offset, input ? "input" : "output");
 
 	if (input)
-		armada_37xx_gpio_direction_input(chip, offset);
+		ret = armada_37xx_gpio_direction_input(chip, offset);
 	else
-		armada_37xx_gpio_direction_output(chip, offset, 0);
+		ret = armada_37xx_gpio_direction_output(chip, offset, 0);
 
-	return 0;
+	return ret;
 }
 
 static int armada_37xx_gpio_request_enable(struct pinctrl_dev *pctldev,
drivers/pinctrl/pinctrl-at91.c +5 -1
index 4e6e151db11f..4265a4055a38 100644
@@ -1819,12 +1819,16 @@ static int at91_gpio_probe(struct platform_device *pdev)
 	struct at91_gpio_chip *at91_chip = NULL;
 	struct gpio_chip *chip;
 	struct pinctrl_gpio_range *range;
+	int alias_idx;
 	int ret = 0;
 	int irq, i;
-	int alias_idx = of_alias_get_id(np, "gpio");
 	uint32_t ngpio;
 	char **names;
 
+	alias_idx = of_alias_get_id(np, "gpio");
+	if (alias_idx < 0)
+		return alias_idx;
+
 	BUG_ON(alias_idx >= ARRAY_SIZE(gpio_chips));
 	if (gpio_chips[alias_idx]) {
 		ret = -EBUSY;
drivers/platform/Kconfig +2 -0
index 971426bb4302..18fc6a08569e 100644
@@ -13,3 +13,5 @@ source "drivers/platform/chrome/Kconfig"
 source "drivers/platform/mellanox/Kconfig"
 
 source "drivers/platform/olpc/Kconfig"
+
+source "drivers/platform/surface/Kconfig"
drivers/platform/Makefile +1 -0
index 6fda58c021ca..4de08ef4ec9d 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_MIPS)		+= mips/
 obj-$(CONFIG_OLPC_EC)		+= olpc/
 obj-$(CONFIG_GOLDFISH)		+= goldfish/
 obj-$(CONFIG_CHROME_PLATFORMS)	+= chrome/
+obj-$(CONFIG_SURFACE_PLATFORMS)	+= surface/
drivers/platform/surface/Kconfig new file +14 -0
new file mode 100644
index 000000000000..b67926ece95f
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Microsoft Surface Platform-Specific Drivers
+#
+
+menuconfig SURFACE_PLATFORMS
+	bool "Microsoft Surface Platform-Specific Device Drivers"
+	default y
+	help
+	  Say Y here to get to see options for platform-specific device drivers
+	  for Microsoft Surface devices. This option alone does not add any
+	  kernel code.
+
+	  If you say N, all options in this submenu will be skipped and disabled.
drivers/platform/surface/Makefile new file +5 -0
new file mode 100644
index 000000000000..3700f9e84299
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/surface
+# Microsoft Surface Platform-Specific Drivers
+#
drivers/platform/x86/dell_rbu.c +1 -1
index 3691391fea6b..16e4614ad3e4 100644
@@ -344,7 +344,7 @@ static void packet_empty_list(void)
 		 * zero out the RBU packet memory before freeing
 		 * to make sure there are no stale RBU packets left in memory
 		 */
-		memset(newpacket->data, 0, rbu_data.packetsize);
+		memset(newpacket->data, 0, newpacket->length);
 		set_memory_wb((unsigned long)newpacket->data,
 			1 << newpacket->ordernum);
 		free_pages((unsigned long) newpacket->data,
drivers/power/supply/bq27xxx_battery.c +1 -1
index e6c4dfdc58c4..1cfec675f82f 100644
@@ -1780,7 +1780,7 @@ static int bq27xxx_battery_get_property(struct power_supply *psy,
 	mutex_unlock(&di->lock);
 
 	if (psp != POWER_SUPPLY_PROP_PRESENT && di->cache.flags < 0)
-		return -ENODEV;
+		return di->cache.flags;
 
 	switch (psp) {
 	case POWER_SUPPLY_PROP_STATUS:
drivers/power/supply/bq27xxx_battery_i2c.c +12 -1
index 08c7e2b4155a..bf235d0a9603 100644
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
@@ -40,6 +41,7 @@ static int bq27xxx_battery_i2c_read(struct bq27xxx_device_info *di, u8 reg,
 	struct i2c_msg msg[2];
 	u8 data[2];
 	int ret;
+	int retry = 0;
 
 	if (!client->adapter)
 		return -ENODEV;
@@ -56,7 +58,16 @@ static int bq27xxx_battery_i2c_read(struct bq27xxx_device_info *di, u8 reg,
 	else
 		msg[1].len = 2;
 
-	ret = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg));
+	do {
+		ret = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg));
+		if (ret == -EBUSY && ++retry < 3) {
+			/* sleep 10 milliseconds when busy */
+			usleep_range(10000, 11000);
+			continue;
+		}
+		break;
+	} while (1);
+
 	if (ret < 0)
 		return ret;
 
drivers/rapidio/rio_cm.c +3 -0
index db4c265287ae..b35ef7e9381e 100644
@@ -787,6 +787,9 @@ static int riocm_ch_send(u16 ch_id, void *buf, int len)
 	if (buf == NULL || ch_id == 0 || len == 0 || len > RIO_MAX_MSG_SIZE)
 		return -EINVAL;
 
+	if (len < sizeof(struct rio_ch_chan_hdr))
+		return -EINVAL;		/* insufficient data from user */
+
 	ch = riocm_get_channel(ch_id);
 	if (!ch) {
 		riocm_error("%s(%d) ch_%d not found", current->comm,
drivers/regulator/max14577-regulator.c +4 -1
index 07a150c9bbf2..5a734c4d0a48 100644
@@ -40,11 +40,14 @@ static int max14577_reg_get_current_limit(struct regulator_dev *rdev)
 	struct max14577 *max14577 = rdev_get_drvdata(rdev);
 	const struct maxim_charger_current *limits =
 		&maxim_charger_currents[max14577->dev_type];
+	int ret;
 
 	if (rdev_get_id(rdev) != MAX14577_CHARGER)
 		return -EINVAL;
 
-	max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, &reg_data);
+	ret = max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, &reg_data);
+	if (ret < 0)
+		return ret;
 
 	if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0)
 		return limits->min;
drivers/rpmsg/qcom_smd.c +1 -1
index b5167ef93abf..6facf1b31d46 100644
@@ -746,7 +746,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,
 	__le32 hdr[5] = { cpu_to_le32(len), };
 	int tlen = sizeof(hdr) + len;
 	unsigned long flags;
-	int ret;
+	int ret = 0;
 
 	/* Word aligned channels only accept word size aligned data */
 	if (channel->info_word && len % 4)
drivers/rtc/Kconfig +10 -0
index 22638878c981..5a21b1dc957f 100644
@@ -10,6 +10,16 @@ config RTC_MC146818_LIB
 	bool
 	select RTC_LIB
 
+config RTC_LIB_KUNIT_TEST
+	tristate "KUnit test for RTC lib functions" if !KUNIT_ALL_TESTS
+	depends on KUNIT
+	default KUNIT_ALL_TESTS
+	select RTC_LIB
+	help
+	  Enable this option to test RTC library functions.
+
+	  If unsure, say N.
+
 menuconfig RTC_CLASS
 	bool "Real Time Clock"
 	default n
drivers/rtc/Makefile +1 -0
index 4ac8f19fb631..324d5c7624e3 100644
@@ -186,3 +186,4 @@ obj-$(CONFIG_RTC_DRV_WM8350)	+= rtc-wm8350.o
 obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205.o
 obj-$(CONFIG_RTC_DRV_XGENE)	+= rtc-xgene.o
 obj-$(CONFIG_RTC_DRV_ZYNQMP)	+= rtc-zynqmp.o
+obj-$(CONFIG_RTC_LIB_KUNIT_TEST)	+= lib_test.o
drivers/rtc/class.c +1 -1
index 8b434213bc7a..87cb34acadde 100644
@@ -270,7 +270,7 @@ static void rtc_device_get_offset(struct rtc_device *rtc)
 	 *
 	 * Otherwise the offset seconds should be 0.
 	 */
-	if (rtc->start_secs > rtc->range_max ||
+	if ((rtc->start_secs >= 0 && rtc->start_secs > rtc->range_max) ||
 	    rtc->start_secs + range_secs - 1 < rtc->range_min)
 		rtc->offset_secs = rtc->start_secs - rtc->range_min;
 	else if (rtc->start_secs > rtc->range_min)
drivers/rtc/lib.c +97 -30

153 lines not on this page · raw message

drivers/rtc/lib_test.c new file +79 -0

79 lines not on this page · raw message

drivers/rtc/rtc-sh.c +9 -3
index 579b3ff5c644..8b4a2ef59e60 100644
@@ -485,9 +485,15 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
 		return -ENOENT;
 	}
 
-	rtc->periodic_irq = ret;
-	rtc->carry_irq = platform_get_irq(pdev, 1);
-	rtc->alarm_irq = platform_get_irq(pdev, 2);
+	if (!pdev->dev.of_node) {
+		rtc->periodic_irq = ret;
+		rtc->carry_irq = platform_get_irq(pdev, 1);
+		rtc->alarm_irq = platform_get_irq(pdev, 2);
+	} else {
+		rtc->alarm_irq = ret;
+		rtc->periodic_irq = platform_get_irq(pdev, 1);
+		rtc->carry_irq = platform_get_irq(pdev, 2);
+	}
 
 	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
 	if (!res)
drivers/s390/scsi/zfcp_sysfs.c +2 -0
index af197e2b3e69..2a4e5c3f1a5f 100644
@@ -355,6 +355,8 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
 	if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))
 		return -EINVAL;
 
+	flush_work(&port->rport_work);
+
 	retval = zfcp_unit_add(port, fcp_lun);
 	if (retval)
 		return retval;
drivers/scsi/lpfc/lpfc_sli.c +2 -2
index 04b9a94f2f5e..e1ef28d9a89e 100644
@@ -5407,9 +5407,9 @@ lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba)
 	phba->sli4_hba.lnk_info.lnk_no =
 		bf_get(lpfc_cntl_attr_lnk_numb, cntl_attr);
 
-	memset(phba->BIOSVersion, 0, sizeof(phba->BIOSVersion));
-	strlcat(phba->BIOSVersion, (char *)cntl_attr->bios_ver_str,
+	memcpy(phba->BIOSVersion, cntl_attr->bios_ver_str,
 		sizeof(phba->BIOSVersion));
+	phba->BIOSVersion[sizeof(phba->BIOSVersion) - 1] = '\0';
 
 	lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
 			"3086 lnk_type:%d, lnk_numb:%d, bios_ver:%s\n",
drivers/scsi/qedf/qedf_main.c +1 -1
index 3f137ca65038..5ca4ef15d6fd 100644
@@ -627,7 +627,7 @@ static u32 qedf_get_login_failures(void *cookie)
 }
 
 static struct qed_fcoe_cb_ops qedf_cb_ops = {
-	{
+	.common = {
 		.link_update = qedf_link_update,
 		.dcbx_aen = qedf_dcbx_handler,
 		.get_generic_tlv_data = qedf_get_generic_tlv_data,
drivers/scsi/scsi_transport_iscsi.c +5 -6
index d75097f13efc..0977e4a09db0 100644
@@ -3235,7 +3235,7 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport,
 		pr_err("%s could not find host no %u\n",
 		       __func__, ev->u.new_flashnode.host_no);
 		err = -ENODEV;
-		goto put_host;
+		goto exit_new_fnode;
 	}
 
 	index = transport->new_flashnode(shost, data, len);
@@ -3245,7 +3245,6 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport,
 	else
 		err = -EIO;
 
-put_host:
 	scsi_host_put(shost);
 
 exit_new_fnode:
@@ -3270,7 +3269,7 @@ static int iscsi_del_flashnode(struct iscsi_transport *transport,
 		pr_err("%s could not find host no %u\n",
 		       __func__, ev->u.del_flashnode.host_no);
 		err = -ENODEV;
-		goto put_host;
+		goto exit_del_fnode;
 	}
 
 	idx = ev->u.del_flashnode.flashnode_idx;
@@ -3312,7 +3311,7 @@ static int iscsi_login_flashnode(struct iscsi_transport *transport,
 		pr_err("%s could not find host no %u\n",
 		       __func__, ev->u.login_flashnode.host_no);
 		err = -ENODEV;
-		goto put_host;
+		goto exit_login_fnode;
 	}
 
 	idx = ev->u.login_flashnode.flashnode_idx;
@@ -3364,7 +3363,7 @@ static int iscsi_logout_flashnode(struct iscsi_transport *transport,
 		pr_err("%s could not find host no %u\n",
 		       __func__, ev->u.logout_flashnode.host_no);
 		err = -ENODEV;
-		goto put_host;
+		goto exit_logout_fnode;
 	}
 
 	idx = ev->u.logout_flashnode.flashnode_idx;
@@ -3414,7 +3413,7 @@ static int iscsi_logout_flashnode_sid(struct iscsi_transport *transport,
 		pr_err("%s could not find host no %u\n",
 		       __func__, ev->u.logout_flashnode.host_no);
 		err = -ENODEV;
-		goto put_host;
+		goto exit_logout_sid;
 	}
 
 	session = iscsi_session_lookup(ev->u.logout_flashnode_sid.sid);
drivers/scsi/storvsc_drv.c +6 -4
index ffba2c340440..ae42e3c4663a 100644
@@ -393,7 +393,7 @@ MODULE_PARM_DESC(ring_avail_percent_lowater,
 /*
  * Timeout in seconds for all devices managed by this driver.
  */
-static int storvsc_timeout = 180;
+static const int storvsc_timeout = 180;
 
 #if IS_ENABLED(CONFIG_SCSI_FC_ATTRS)
 static struct scsi_transport_template *fc_transport_template;
@@ -707,7 +707,7 @@ static void  handle_multichannel_storage(struct hv_device *device, int max_chns)
 		return;
 	}
 
-	t = wait_for_completion_timeout(&request->wait_event, 10*HZ);
+	t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);
 	if (t == 0) {
 		dev_err(dev, "Failed to create sub-channel: timed out\n");
 		return;
@@ -768,7 +768,7 @@ static int storvsc_execute_vstor_op(struct hv_device *device,
 	if (ret != 0)
 		return ret;
 
-	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
+	t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);
 	if (t == 0)
 		return -ETIMEDOUT;
 
@@ -1200,6 +1200,8 @@ static int storvsc_connect_to_vsp(struct hv_device *device, u32 ring_size,
 		return ret;
 
 	ret = storvsc_channel_init(device, is_fc);
+	if (ret)
+		vmbus_close(device->channel);
 
 	return ret;
 }
@@ -1503,7 +1505,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
 	if (ret != 0)
 		return FAILED;
 
-	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
+	t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);
 	if (t == 0)
 		return TIMEOUT_ERROR;
 
drivers/soc/aspeed/aspeed-lpc-snoop.c +14 -3
index 538d7aab8db5..43e30937fc9d 100644
@@ -168,7 +168,7 @@ static int aspeed_lpc_snoop_config_irq(struct aspeed_lpc_snoop *lpc_snoop,
 	int rc;
 
 	lpc_snoop->irq = platform_get_irq(pdev, 0);
-	if (!lpc_snoop->irq)
+	if (lpc_snoop->irq < 0)
 		return -ENODEV;
 
 	rc = devm_request_irq(dev, lpc_snoop->irq,
@@ -202,11 +202,15 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
 	lpc_snoop->chan[channel].miscdev.minor = MISC_DYNAMIC_MINOR;
 	lpc_snoop->chan[channel].miscdev.name =
 		devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, channel);
+	if (!lpc_snoop->chan[channel].miscdev.name) {
+		rc = -ENOMEM;
+		goto err_free_fifo;
+	}
 	lpc_snoop->chan[channel].miscdev.fops = &snoop_fops;
 	lpc_snoop->chan[channel].miscdev.parent = dev;
 	rc = misc_register(&lpc_snoop->chan[channel].miscdev);
 	if (rc)
-		return rc;
+		goto err_free_fifo;
 
 	/* Enable LPC snoop channel at requested port */
 	switch (channel) {
@@ -223,7 +227,8 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
 		hicrb_en = HICRB_ENSNP1D;
 		break;
 	default:
-		return -EINVAL;
+		rc = -EINVAL;
+		goto err_misc_deregister;
 	}
 
 	regmap_update_bits(lpc_snoop->regmap, HICR5, hicr5_en, hicr5_en);
@@ -233,6 +238,12 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
 		regmap_update_bits(lpc_snoop->regmap, HICRB,
 				hicrb_en, hicrb_en);
 
+	return 0;
+
+err_misc_deregister:
+	misc_deregister(&lpc_snoop->chan[channel].miscdev);
+err_free_fifo:
+	kfifo_free(&lpc_snoop->chan[channel].fifo);
 	return rc;
 }
 
drivers/spi/spi-sh-msiof.c +7 -6
index edb26b085706..80a39424dc1e 100644
@@ -918,6 +918,7 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr,
 	void *rx_buf = t->rx_buf;
 	unsigned int len = t->len;
 	unsigned int bits = t->bits_per_word;
+	unsigned int max_wdlen = 256;
 	unsigned int bytes_per_word;
 	unsigned int words;
 	int n;
@@ -931,17 +932,17 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr,
 	if (!spi_controller_is_slave(p->ctlr))
 		sh_msiof_spi_set_clk_regs(p, clk_get_rate(p->clk), t->speed_hz);
 
+	if (tx_buf)
+		max_wdlen = min(max_wdlen, p->tx_fifo_size);
+	if (rx_buf)
+		max_wdlen = min(max_wdlen, p->rx_fifo_size);
+
 	while (ctlr->dma_tx && len > 15) {
 		/*
 		 *  DMA supports 32-bit words only, hence pack 8-bit and 16-bit
 		 *  words, with byte resp. word swapping.
 		 */
-		unsigned int l = 0;
-
-		if (tx_buf)
-			l = min(round_down(len, 4), p->tx_fifo_size * 4);
-		if (rx_buf)
-			l = min(round_down(len, 4), p->rx_fifo_size * 4);
+		unsigned int l = min(round_down(len, 4), max_wdlen * 4);
 
 		if (bits <= 8) {
 			copy32 = copy_bswap32;
drivers/staging/iio/impedance-analyzer/ad5933.c +1 -1
index 54388660021e..fef4773599a9 100644
@@ -412,7 +412,7 @@ static ssize_t ad5933_store(struct device *dev,
 		ret = ad5933_cmd(st, 0);
 		break;
 	case AD5933_OUT_SETTLING_CYCLES:
-		val = clamp(val, (u16)0, (u16)0x7FF);
+		val = clamp(val, (u16)0, (u16)0x7FC);
 		st->settling_cycles = val;
 
 		/* 2x, 4x handling, see datasheet */
drivers/tee/tee_core.c +6 -5
index 2db144d2d26f..357944bc73b1 100644
@@ -9,6 +9,7 @@
 #include <linux/fs.h>
 #include <linux/idr.h>
 #include <linux/module.h>
+#include <linux/overflow.h>
 #include <linux/slab.h>
 #include <linux/tee_drv.h>
 #include <linux/uaccess.h>
@@ -16,7 +17,7 @@
 
 #define TEE_NUM_DEVICES	32
 
-#define TEE_IOCTL_PARAM_SIZE(x) (sizeof(struct tee_param) * (x))
+#define TEE_IOCTL_PARAM_SIZE(x) (size_mul(sizeof(struct tee_param), (x)))
 
 /*
  * Unprivileged devices in the lower half range and privileged devices in
@@ -327,7 +328,7 @@ static int tee_ioctl_open_session(struct tee_context *ctx,
 	if (copy_from_user(&arg, uarg, sizeof(arg)))
 		return -EFAULT;
 
-	if (sizeof(arg) + TEE_IOCTL_PARAM_SIZE(arg.num_params) != buf.buf_len)
+	if (size_add(sizeof(arg), TEE_IOCTL_PARAM_SIZE(arg.num_params)) != buf.buf_len)
 		return -EINVAL;
 
 	if (arg.num_params) {
@@ -398,7 +399,7 @@ static int tee_ioctl_invoke(struct tee_context *ctx,
 	if (copy_from_user(&arg, uarg, sizeof(arg)))
 		return -EFAULT;
 
-	if (sizeof(arg) + TEE_IOCTL_PARAM_SIZE(arg.num_params) != buf.buf_len)
+	if (size_add(sizeof(arg), TEE_IOCTL_PARAM_SIZE(arg.num_params)) != buf.buf_len)
 		return -EINVAL;
 
 	if (arg.num_params) {
@@ -532,7 +533,7 @@ static int tee_ioctl_supp_recv(struct tee_context *ctx,
 	if (get_user(num_params, &uarg->num_params))
 		return -EFAULT;
 
-	if (sizeof(*uarg) + TEE_IOCTL_PARAM_SIZE(num_params) != buf.buf_len)
+	if (size_add(sizeof(*uarg), TEE_IOCTL_PARAM_SIZE(num_params)) != buf.buf_len)
 		return -EINVAL;
 
 	params = kcalloc(num_params, sizeof(struct tee_param), GFP_KERNEL);
@@ -631,7 +632,7 @@ static int tee_ioctl_supp_send(struct tee_context *ctx,
 	    get_user(num_params, &uarg->num_params))
 		return -EFAULT;
 
-	if (sizeof(*uarg) + TEE_IOCTL_PARAM_SIZE(num_params) > buf.buf_len)
+	if (size_add(sizeof(*uarg), TEE_IOCTL_PARAM_SIZE(num_params)) > buf.buf_len)
 		return -EINVAL;
 
 	params = kcalloc(num_params, sizeof(struct tee_param), GFP_KERNEL);
drivers/thunderbolt/ctl.c +5 -0
index fd074c6ebe0d..206567aa61e2 100644
@@ -131,6 +131,11 @@ static void tb_cfg_request_dequeue(struct tb_cfg_request *req)
 	struct tb_ctl *ctl = req->ctl;
 
 	mutex_lock(&ctl->request_queue_lock);
+	if (!test_bit(TB_CFG_REQUEST_ACTIVE, &req->flags)) {
+		mutex_unlock(&ctl->request_queue_lock);
+		return;
+	}
+
 	list_del(&req->list);
 	clear_bit(TB_CFG_REQUEST_ACTIVE, &req->flags);
 	if (test_bit(TB_CFG_REQUEST_CANCELED, &req->flags))
drivers/tty/serial/milbeaut_usio.c +4 -1
index 949ab7efc4fc..e7ad13e2323f 100644
@@ -527,7 +527,10 @@ static int mlb_usio_probe(struct platform_device *pdev)
 	}
 	port->membase = devm_ioremap(&pdev->dev, res->start,
 				resource_size(res));
-
+	if (!port->membase) {
+		ret = -ENOMEM;
+		goto failed;
+	}
 	ret = platform_get_irq_byname(pdev, "rx");
 	mlb_usio_irq[index][RX] = ret;
 
drivers/tty/vt/vt_ioctl.c +0 -2
index f623b3859e98..0d51353d1e0d 100644
@@ -1106,8 +1106,6 @@ long vt_compat_ioctl(struct tty_struct *tty,
 	case VT_WAITACTIVE:
 	case VT_RELDISP:
 	case VT_DISALLOCATE:
-	case VT_RESIZE:
-	case VT_RESIZEX:
 		return vt_ioctl(tty, cmd, arg);
 
 	/*
drivers/uio/uio_hv_generic.c +2 -2
index 8ea5ae954243..c707c3627cc2 100644
@@ -288,13 +288,13 @@ hv_uio_probe(struct hv_device *dev,
 	pdata->info.mem[INT_PAGE_MAP].name = "int_page";
 	pdata->info.mem[INT_PAGE_MAP].addr
 		= (uintptr_t)vmbus_connection.int_page;
-	pdata->info.mem[INT_PAGE_MAP].size = PAGE_SIZE;
+	pdata->info.mem[INT_PAGE_MAP].size = HV_HYP_PAGE_SIZE;
 	pdata->info.mem[INT_PAGE_MAP].memtype = UIO_MEM_LOGICAL;
 
 	pdata->info.mem[MON_PAGE_MAP].name = "monitor_page";
 	pdata->info.mem[MON_PAGE_MAP].addr
 		= (uintptr_t)vmbus_connection.monitor_pages[1];
-	pdata->info.mem[MON_PAGE_MAP].size = PAGE_SIZE;
+	pdata->info.mem[MON_PAGE_MAP].size = HV_HYP_PAGE_SIZE;
 	pdata->info.mem[MON_PAGE_MAP].memtype = UIO_MEM_LOGICAL;
 
 	pdata->recv_buf = vzalloc(RECV_BUFFER_SIZE);
drivers/usb/class/usbtmc.c +3 -1
index 67e96fc4f9b5..d8ed205e6b43 100644
@@ -486,6 +486,7 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,
 	__u8 stb;
 	int rv;
 	long wait_rv;
+	unsigned long expire;
 
 	dev_dbg(dev, "Enter ioctl_read_stb iin_ep_present: %d\n",
 		data->iin_ep_present);
@@ -528,10 +529,11 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,
 	}
 
 	if (data->iin_ep_present) {
+		expire = msecs_to_jiffies(file_data->timeout);
 		wait_rv = wait_event_interruptible_timeout(
 			data->waitq,
 			atomic_read(&data->iin_data_valid) != 0,
-			file_data->timeout);
+			expire);
 		if (wait_rv < 0) {
 			dev_dbg(dev, "wait interrupted %ld\n", wait_rv);
 			rv = wait_rv;
drivers/usb/core/hub.c +14 -2
index f7c365db1e9c..585375817f5e 100644
@@ -5826,6 +5826,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
 	struct usb_hub			*parent_hub;
 	struct usb_hcd			*hcd = bus_to_hcd(udev->bus);
 	struct usb_device_descriptor	descriptor = udev->descriptor;
+	struct usb_interface		*intf;
 	struct usb_host_bos		*bos;
 	int				i, j, ret = 0;
 	int				port1 = udev->portnum;
@@ -5887,6 +5888,18 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
 	if (!udev->actconfig)
 		goto done;
 
+	/*
+	 * Some devices can't handle setting default altsetting 0 with a
+	 * Set-Interface request. Disable host-side endpoints of those
+	 * interfaces here. Enable and reset them back after host has set
+	 * its internal endpoint structures during usb_hcd_alloc_bandwith()
+	 */
+	for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
+		intf = udev->actconfig->interface[i];
+		if (intf->cur_altsetting->desc.bAlternateSetting == 0)
+			usb_disable_interface(udev, intf, true);
+	}
+
 	mutex_lock(hcd->bandwidth_mutex);
 	ret = usb_hcd_alloc_bandwidth(udev, udev->actconfig, NULL, NULL);
 	if (ret < 0) {
@@ -5918,12 +5931,11 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
 	 */
 	for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
 		struct usb_host_config *config = udev->actconfig;
-		struct usb_interface *intf = config->interface[i];
 		struct usb_interface_descriptor *desc;
 
+		intf = config->interface[i];
 		desc = &intf->cur_altsetting->desc;
 		if (desc->bAlternateSetting == 0) {
-			usb_disable_interface(udev, intf, true);
 			usb_enable_interface(udev, intf, true);
 			ret = 0;
 		} else {
drivers/usb/core/quirks.c +3 -0
index 98d78bbadb77..98b1c457a091 100644
@@ -369,6 +369,9 @@ static const struct usb_device_id usb_quirk_list[] = {
 	/* SanDisk Corp. SanDisk 3.2Gen1 */
 	{ USB_DEVICE(0x0781, 0x55a3), .driver_info = USB_QUIRK_DELAY_INIT },
 
+	/* SanDisk Extreme 55AE */
+	{ USB_DEVICE(0x0781, 0x55ae), .driver_info = USB_QUIRK_NO_LPM },
+
 	/* Realforce 87U Keyboard */
 	{ USB_DEVICE(0x0853, 0x011b), .driver_info = USB_QUIRK_NO_LPM },
 
drivers/usb/gadget/function/f_hid.c +6 -6
index 571560d689c8..77354626252c 100644
@@ -114,8 +114,8 @@ static struct hid_descriptor hidg_desc = {
 	.bcdHID				= cpu_to_le16(0x0101),
 	.bCountryCode			= 0x00,
 	.bNumDescriptors		= 0x1,
-	/*.desc[0].bDescriptorType	= DYNAMIC */
-	/*.desc[0].wDescriptorLenght	= DYNAMIC */
+	/*.rpt_desc.bDescriptorType	= DYNAMIC */
+	/*.rpt_desc.wDescriptorLength	= DYNAMIC */
 };
 
 /* Super-Speed Support */
@@ -730,8 +730,8 @@ static int hidg_setup(struct usb_function *f,
 			struct hid_descriptor hidg_desc_copy = hidg_desc;
 
 			VDBG(cdev, "USB_REQ_GET_DESCRIPTOR: HID\n");
-			hidg_desc_copy.desc[0].bDescriptorType = HID_DT_REPORT;
-			hidg_desc_copy.desc[0].wDescriptorLength =
+			hidg_desc_copy.rpt_desc.bDescriptorType = HID_DT_REPORT;
+			hidg_desc_copy.rpt_desc.wDescriptorLength =
 				cpu_to_le16(hidg->report_desc_length);
 
 			length = min_t(unsigned short, length,
@@ -972,8 +972,8 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
 	 * We can use hidg_desc struct here but we should not relay
 	 * that its content won't change after returning from this function.
 	 */
-	hidg_desc.desc[0].bDescriptorType = HID_DT_REPORT;
-	hidg_desc.desc[0].wDescriptorLength =
+	hidg_desc.rpt_desc.bDescriptorType = HID_DT_REPORT;
+	hidg_desc.rpt_desc.wDescriptorLength =
 		cpu_to_le16(hidg->report_desc_length);
 
 	hidg_hs_in_ep_desc.bEndpointAddress =
drivers/usb/renesas_usbhs/common.c +38 -12

94 lines not on this page · raw message

drivers/usb/storage/unusual_uas.h +7 -0
index b8b1c2678d84..ff296434d601 100644
@@ -52,6 +52,13 @@ UNUSUAL_DEV(0x059f, 0x1061, 0x0000, 0x9999,
 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
 		US_FL_NO_REPORT_OPCODES | US_FL_NO_SAME),
 
+/* Reported-by: Zhihong Zhou <[email protected]> */
+UNUSUAL_DEV(0x0781, 0x55e8, 0x0000, 0x9999,
+		"SanDisk",
+		"",
+		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+		US_FL_IGNORE_UAS),
+
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/video/console/vgacon.c +1 -1
index 23f15f42e5cb..6a7c0ea1184e 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/core/fbcvt.c +1 -1
index 64843464c661..cd3821bd82e5 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/core/fbmem.c +3 -1
index 23ce47655c93..c42982b07ca7 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/da9052_wdt.c +1 -0
index d708c091bf1b..180526220d8c 100644

Lines of this file are not shown. View the raw message.

fs/configfs/dir.c +1 -1
index bc27e3ad97ff..138f43e9126c 100644

Lines of this file are not shown. View the raw message.

fs/ext4/extents.c +6 -5
index 5c0ef7a04169..cb1e95d09ddf 100644

Lines of this file are not shown. View the raw message.

fs/ext4/inline.c +1 -1
index 7e250ceacb8e..7e8892dad2d7 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/data.c +1 -1
index 8f78050c935d..e7aa23f09847 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/f2fs.h +8 -2
index 44c849bebd2e..1b8f41daddba 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/namei.c +14 -5
index 99a91c746b39..b2b1bf53dcf2 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/super.c +2 -2
index da51474596ef..d4ba9ad16a13 100644

Lines of this file are not shown. View the raw message.

fs/filesystems.c +9 -5
index 5e1a19013373..148073e372ac 100644

Lines of this file are not shown. View the raw message.

fs/gfs2/inode.c +2 -1
index 4e0c933e0800..496449fccc82 100644

Lines of this file are not shown. View the raw message.

fs/gfs2/lock_dlm.c +2 -1
index 94c290a333a0..257dfa23ea3f 100644

Lines of this file are not shown. View the raw message.

fs/jbd2/transaction.c +2 -1
index 91c2d3f6d1b3..72e9297d6adc 100644

Lines of this file are not shown. View the raw message.

fs/jffs2/erase.c +3 -1
index 5fbaf6ab9f48..796dd3807a5d 100644

Lines of this file are not shown. View the raw message.

fs/jffs2/scan.c +3 -1
index f73904c08b39..87b006363c57 100644

Lines of this file are not shown. View the raw message.

fs/jffs2/summary.c +6 -1
index 4fe64519870f..d83372d3e1a0 100644

Lines of this file are not shown. View the raw message.

fs/jfs/jfs_discard.c +2 -1
index 5f4b305030ad..4b660296caf3 100644

Lines of this file are not shown. View the raw message.

fs/jfs/jfs_dtree.c +15 -3
index 4666aee2e1f4..93df5f3bb3bb 100644

Lines of this file are not shown. View the raw message.

fs/namespace.c +4 -0
index a5cb608778b1..8a3514489768 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfs3xdr.c +1 -1
index 03e8c45a52f3..25b6b4db0af2 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfs4proc.c +2 -1
index 3bae364048f6..527d6b29dffb 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/vfs.c +4 -0
index 6aa968bee0ce..bee4fdf6e239 100644

Lines of this file are not shown. View the raw message.

fs/nilfs2/btree.c +3 -1
index 7c9f4d79bdbc..4a5e8495fa67 100644

Lines of this file are not shown. View the raw message.

fs/nilfs2/direct.c +3 -0
index 7faf8c285d6c..a72371cd6b95 100644

Lines of this file are not shown. View the raw message.

fs/squashfs/super.c +5 -0
index 2110323b610b..545207683ddd 100644

Lines of this file are not shown. View the raw message.

include/acpi/actypes.h +1 -1
index ff5fecff5116..f931312cf51a 100644

Lines of this file are not shown. View the raw message.

include/linux/atmdev.h +6 -0
index 8124815eb121..19c0f91c38bd 100644

Lines of this file are not shown. View the raw message.

include/linux/hid.h +2 -1
index af73e8c815af..69a0967004d2 100644

Lines of this file are not shown. View the raw message.

include/trace/events/erofs.h +0 -18
index ecfad7641096..29cb9661bf5d 100644

Lines of this file are not shown. View the raw message.

include/uapi/linux/videodev2.h +0 -1
index 895c5ba8b6ac..5384c9d61d51 100644

Lines of this file are not shown. View the raw message.

ipc/shm.c +4 -1
index 0145767da1c1..acc182555178 100644

Lines of this file are not shown. View the raw message.

kernel/events/core.c +15 -8
index dd55fd475f12..ecae7c7f895b 100644

Lines of this file are not shown. View the raw message.

kernel/exit.c +9 -8
index 56d3a099825f..8cb4a82c4ed3 100644

Lines of this file are not shown. View the raw message.

kernel/power/wakelock.c +3 -0
index 52571dcad768..4e941999a53b 100644

Lines of this file are not shown. View the raw message.

kernel/time/posix-cpu-timers.c +9 -0
index eacb0ca30193..c77433047a9d 100644

Lines of this file are not shown. View the raw message.

kernel/trace/bpf_trace.c +1 -1
index 75ea2ab53213..d001602fde59 100644

Lines of this file are not shown. View the raw message.

kernel/trace/ftrace.c +7 -3
index 50c266f70b54..03a14d939ac3 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace.c +1 -1
index 06c12d873c17..26b17776e8d2 100644

Lines of this file are not shown. View the raw message.

mm/huge_memory.c +1 -1
index 03b57323c53b..ceb5b6d720f0 100644

Lines of this file are not shown. View the raw message.

mm/page-writeback.c +1 -1
index fd00a511644e..ad68a2d0119b 100644

Lines of this file are not shown. View the raw message.

net/atm/common.c +1 -0
index 0ce530af534d..1e07a5fc53d0 100644

Lines of this file are not shown. View the raw message.

net/atm/lec.c +10 -2
index 07d4f256c38c..49fe366c3b1d 100644

Lines of this file are not shown. View the raw message.

net/atm/raw.c +1 -1
index b3ba44aab0ee..b11ef6dccc31 100644

Lines of this file are not shown. View the raw message.

net/bluetooth/l2cap_core.c +2 -1
index 874f12d93bfa..dc9edf8fc336 100644

Lines of this file are not shown. View the raw message.

net/bridge/netfilter/nf_conntrack_bridge.c +6 -6
index d14b2dbbd1df..abf0c9460ddf 100644

Lines of this file are not shown. View the raw message.

net/core/sock.c +2 -2
index a8359770fd93..418d0857d2aa 100644

Lines of this file are not shown. View the raw message.

net/ipv4/route.c +4 -0
index da280a2df4e6..d173234503f9 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp_input.c +35 -28

63 lines not on this page · raw message

net/ipv6/calipso.c +8 -0
index 9bc612b3f834..332c25bc9dd5 100644

Lines of this file are not shown. View the raw message.

net/ipv6/netfilter.c +6 -6
index ab9a279dd6d4..93e1af6c2dfb 100644

Lines of this file are not shown. View the raw message.

net/ipv6/netfilter/nft_fib_ipv6.c +9 -4
index 03dbd16f9ad5..018f01efeca5 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mesh_hwmp.c +4 -2
index 295f98b4502e..ae1c700dc82e 100644

Lines of this file are not shown. View the raw message.

net/mpls/af_mpls.c +2 -2
index 3a55a392e021..bac87a6b7e5b 100644

Lines of this file are not shown. View the raw message.

net/ncsi/internal.h +10 -11
index 1dde6dc841b8..b723452768d4 100644

Lines of this file are not shown. View the raw message.

net/ncsi/ncsi-pkt.h +11 -12
index 3fbea7e74fb1..2729581360ec 100644

Lines of this file are not shown. View the raw message.

net/ncsi/ncsi-rsp.c +10 -11
index 876622e9a5b2..b7d311f97905 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nft_socket.c +2 -1
index c7b78e4ef459..46d11f943795 100644

Lines of this file are not shown. View the raw message.

net/netlabel/netlabel_kapi.c +5 -0
index 96059c99b915..19325925941f 100644

Lines of this file are not shown. View the raw message.

net/nfc/nci/uart.c +4 -4
index 11b554ce07ff..9e58774f985e 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_prio.c +1 -1
index 647941702f9f..62c1b1f352b2 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_red.c +1 -1
index 476853ff6989..64532ee591a9 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_sfq.c +4 -1
index d7f910610de9..acda65371028 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_tbf.c +1 -1
index 259a39ca99bf..9b11e9256336 100644

Lines of this file are not shown. View the raw message.

net/sctp/socket.c +2 -1
index d7257eec66b1..1ac05147dc30 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/cache.c +2 -0
index 2215314dc4c5..47623d49fa3a 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/xprtrdma/verbs.c +2 -0
index cfae1a871578..4fd3f632a2af 100644

Lines of this file are not shown. View the raw message.

net/tipc/udp_media.c +2 -2
index 5f278c25462e..1cdc9a9103e0 100644

Lines of this file are not shown. View the raw message.

net/tls/tls_sw.c +7 -0
index 03f608da594e..432bce329392 100644

Lines of this file are not shown. View the raw message.

security/selinux/xfrm.c +1 -1
index 00e95f8bd7c7..ccc3a4389ce9 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_intel.c +2 -0
index cdc1d00ab34b..83e57520d424 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_realtek.c +1 -0
index 2e7b45f5f8b1..3d12c489ba1e 100644

Lines of this file are not shown. View the raw message.

tools/perf/builtin-record.c +1 -1
index 9c03f67398cb..8f03f89a6031 100644

Lines of this file are not shown. View the raw message.

tools/perf/scripts/python/exported-sql-viewer.py +4 -1
index 01acf3ea7619..21473d6df5b9 100755

Lines of this file are not shown. View the raw message.

tools/perf/tests/switch-tracking.c +1 -1
index ffa592e0020e..ffe3831fb7bf 100644

Lines of this file are not shown. View the raw message.

tools/perf/ui/browsers/hists.c +1 -1
index 3461fa8cf440..2a38140391c4 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/seccomp/seccomp_bpf.c +5 -2
index 19c7351eeb74..a12eea3aff10 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.