Merge 0625d7c240 ("Revert "Bluetooth: af_bluetooth: Fix deadlock"") into android14-6.1-lts

Browse Source

Steps on the way to 6.1.118

Merges around these reverts as we have already reverted them in our tree
and directly merging causes conflicts.

Change-Id: I92d2b4fe1428b1979ee3e0f63247eb3400378e3a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2024-11-29 12:29:20 +00:00

parent bb58b1f9bf 0625d7c240

commit 27e7205cf2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available