Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
authorDom Cobley <popcornmix@gmail.com>
Fri, 22 Jul 2022 10:01:19 +0000 (11:01 +0100)
committerDom Cobley <popcornmix@gmail.com>
Fri, 22 Jul 2022 10:01:19 +0000 (11:01 +0100)
1  2 
drivers/tty/serial/amba-pl011.c
drivers/video/fbdev/core/fbmem.c
kernel/cgroup/cgroup.c
sound/usb/quirks.c

Simple merge
Simple merge
Simple merge
@@@ -1912,8 -1915,12 +1915,14 @@@ static const struct usb_audio_quirk_fla
                   QUIRK_FLAG_ALIGN_TRANSFER),
        DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
                   QUIRK_FLAG_GET_SAMPLE_RATE),
+       DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
+                  QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+       DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
+                  QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+       DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
+                  QUIRK_FLAG_GENERIC_IMPLICIT_FB),
 +      DEVICE_FLG(0x09da, 0x2695, /* A4Tech FHD 1080p webcam */
 +                 QUIRK_FLAG_DISABLE_AUTOSUSPEND | QUIRK_FLAG_GET_SAMPLE_RATE),
  
        /* Vendor matches */
        VENDOR_FLG(0x045e, /* MS Lifecam */