Hi Erik, On Wed, Sep 30, 2026 at 10:51:54PM +0200, Erik Brangs wrote: > Hi, > > 4a23ce935f74 does not apply cleanly to v6.12.111 > > diff --cc drivers/bluetooth/btrtl.c > index 6bb068dee6d2,5603b282f9bc..000000000000 > --- a/drivers/bluetooth/btrtl.c > +++ b/drivers/bluetooth/btrtl.c > @@@ -1317,7 -1317,7 +1317,11 @@@ void btrtl_set_quirks(struct hci_dev *h > case CHIP_ID_8922A: > case CHIP_ID_8852BT: > case CHIP_ID_8761C: > ++<<<<<<< HEAD > + set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks); > ++======= > + hci_set_quirk(hdev, HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED); > ++>>>>>>> 4a23ce935f74 (Bluetooth: btrtl: Add the support for RTL8761CUV) > /* RTL8852C needs to transmit mSBC data continuously without > * the zero length of USB packets for the ALT 6 supported > chips > > > or to the first bad commit f05baf6e0680d8c10d2fbbc5953848fc3e3db957 > > diff --cc drivers/bluetooth/btrtl.c > index 49b74827344c,5603b282f9bc..000000000000 > --- a/drivers/bluetooth/btrtl.c > +++ b/drivers/bluetooth/btrtl.c > @@@ -1306,7 -1316,8 +1317,12 @@@ void btrtl_set_quirks(struct hci_dev *h > case CHIP_ID_8851B: > case CHIP_ID_8922A: > case CHIP_ID_8852BT: > ++<<<<<<< HEAD > + set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks); > ++======= > + case CHIP_ID_8761C: > + hci_set_quirk(hdev, HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED); > ++>>>>>>> 4a23ce935f74 (Bluetooth: btrtl: Add the support for RTL8761CUV) > /* RTL8852C needs to transmit mSBC data continuously without > * the zero length of USB packets for the ALT 6 supported > chips
Apologies, this is my error. The mentioned commit 4a23ce935f74 *is* already part of 6.12.111 upstream, so we have here a different issue to report upstream caused by the f05baf6e0680d8c10d2fbbc5953848fc3e3db957 commit. I'm looping in Ben, who said yesterday in the kernel-team meeting to look into this issue as well. but I think we should bring this new problem to upstream regressions list as wel. Regards, Salvatore
