Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y

diff --cc Makefile
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/gpu/drm/tegra/dc.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_crtc.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/usb/quirks.c
index dab95d009d5efa655cef961cedd954e4341820d3,5ab2a4580bfb24d92202564481cc610130a3e693..3f9ecc709705b79c2a2732ccb1c9717e924862d7
--- 1/sound/usb/quirks.c
--- 2/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@@ -1526,7 -1521,7 +1526,8 @@@ bool snd_usb_get_sample_rate_quirk(stru
        case USB_ID(0x21b4, 0x0081): /* AudioQuest DragonFly */
        case USB_ID(0x2912, 0x30c8): /* Audioengine D1 */
        case USB_ID(0x413c, 0xa506): /* Dell AE515 sound bar */
+       case USB_ID(0x046d, 0x084c): /* Logitech ConferenceCam Connect */
 +      case USB_ID(0x09da, 0x2695): /* A4Tech FHD 1080p webcam */
                return true;
        }