Hi Johan, On Tue, Mar 26, 2024 at 3:09 AM Johan Hovold <johan@xxxxxxxxxx> wrote: > > On Mon, Mar 25, 2024 at 04:31:53PM -0400, Luiz Augusto von Dentz wrote: > > On Mon, Mar 25, 2024 at 4:14 PM Johan Hovold <johan@xxxxxxxxxx> wrote: > > > On Mon, Mar 25, 2024 at 04:07:03PM -0400, Luiz Augusto von Dentz wrote: > > > > > Probably needs rebasing: > > > > > > > > Applying: Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" > > > > error: drivers/bluetooth/hci_qca.c: does not match index > > > > Patch failed at 0001 Revert "Bluetooth: hci_qca: Set BDA quirk bit if > > > > fwnode exists in DT" > > > > > > I just verified that it applies cleanly to 6.9-rc1. > > > > > > $ git checkout tmp v6.9-rc1 > > > $ b4 am -sl ZgHVFjAZ1uqEiUa2@xxxxxxxxxxxxxxxxxxxx > > > ... > > > $ git am ./20240314_johan_linaro_revert_bluetooth_hci_qca_set_bda_quirk_bit_if_fwnode_exists_in_dt.mbx > > > Applying: Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" > > > $ b4 am -sl 20240320075554.8178-2-johan+linaro@xxxxxxxxxx > > > ... > > > $ git am ./v4_20240320_johan_linaro_bluetooth_qca_fix_device_address_endianness.mbx > > > Applying: dt-bindings: bluetooth: add 'qcom,local-bd-address-broken' > > > Applying: arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken > > > Applying: Bluetooth: add quirk for broken address properties > > > Applying: Bluetooth: qca: fix device-address endianness > > > > > > Do you have anything else in your tree which may interfere? What tree is > > > that exactly? > > > > bluetooth-next tree, why would it be anything other than that? > > I ask because I did not see anything in either the bluetooth or > bluetooth-next tree which should interfere. > > And I just verified that by applying the revert followed by the series > to bluetooth-next. In that order it applies just fine, as expected. > > > All the > > CI automation is done on bluetooth-next and if you are asking to be > > done via bluetooth tree which is based on the latest rc that is not > > how things works here, we usually first apply to bluetooth-next and in > > case it needs to be backported then it later done via pull-request. > > The revert fixes a regression in 6.7-rc7 and should get to Linus as soon > as possible and I assume you have some way to get fixes into mainline > for the current development cycle. Yeah I will send it later today to be included in the next rc release and since it is marked for stable that shall trigger the process of backporting it. > The series fixes a critical bug in the Qualcomm driver and should > similarly get into mainline as soon as possible to avoid having people > unknowingly start relying on the broken behaviour (reversed address). > The bug in this case is older, but since the bug is severe and we're > only at rc1, I don't think this one should wait for 6.10 either. The revert is now pushed, I had to apply it manually though since it didn't apply cleanly, that said the other set still don't apply: Applying: Bluetooth: qca: fix device-address endianness error: patch failed: drivers/bluetooth/btqca.c:826 error: drivers/bluetooth/btqca.c: patch does not apply error: drivers/bluetooth/hci_qca.c: does not match index Patch failed at 0004 Bluetooth: qca: fix device-address endianness So please rebase and send a v5. -- Luiz Augusto von Dentz
