Skip to contentSkip to conversation

linux-next: manual merge of the bluetooth tree with the origin tree

PATCH Mark Brown 1 participant 1 message Sep 17, 2025

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the bluetooth tree got a conflict in:

net/bluetooth/mgmt.c

between commit:

6bbd0d3f0c23f ("Bluetooth: hci_sync: fix set_local_name race condition")

from the origin tree and commit:

c49a788e88e48 ("Bluetooth: hci_sync: fix set_local_name race condition")

from the bluetooth tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

net/bluetooth/mgmt.c +0 -0
diff --cc net/bluetooth/mgmt.c
index 50634ef5c8b70,b9c53810bf06b..0000000000000