Commit 8656e957 authored by Dan Murphy's avatar Dan Murphy
Browse files

Merge tag 'v5.4.17' of...

Merge tag 'v5.4.17' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-5.4.y

This is the 5.4.17 stable release

* tag 'v5.4.17' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable

: (543 commits)
  Linux 5.4.17
  power/supply: ingenic-battery: Don't change scale if there's only one
  Revert "um: Enable CONFIG_CONSTRUCTORS"
  KVM: arm64: Write arch.mdcr_el2 changes since last vcpu_load on VHE
  crypto: pcrypt - Fix user-after-free on module unload
  crypto: caam - do not reset pointer size from MCFGR register
  crypto: vmx - reject xts inputs that are too short
  crypto: af_alg - Use bh_lock_sock in sk_destruct
  rsi: fix non-atomic allocation in completion handler
  rsi: fix memory leak on failed URB submission
  rsi: fix use-after-free on probe errors
  rsi: fix use-after-free on failed probe and unbind
  bus: ti-sysc: Fix missing force mstandby quirk handling
  Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk
  Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks
  ALSA: hda/realtek - Move some alc236 pintbls to fallback table
  usb-storage: Disable UAS on JMicron SATA enclosure
  bus: ti-sysc: Add module enable quirk for audio AESS
  mmc: sdhci-pci: Add support for Intel JSL
  mmc: sdhci-pci: Quirk for AMD SDHC Device 0x7906
  ...

Signed-off-by: default avatarDan Murphy <dmurphy@ti.com>

# Conflicts:
#	drivers/leds/leds-tlc591xx.c
#	drivers/mmc/host/sdhci_am654.c
#	kernel/dma/direct.c
parents 3d8c2c82 313c8460
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment