From: Mark Brown <broonie@kernel.org>
To: Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Luiz Augusto von Dentz <luiz.von.dentz@intel.com>,
Pavel Shpakovskiy <pashpakovskii@salutedevices.com>
Subject: linux-next: manual merge of the bluetooth tree with the origin tree
Date: Wed, 17 Sep 2025 12:34:05 +0100 [thread overview]
Message-ID: <aMqcrced3cFk9SCl@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
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.
diff --cc net/bluetooth/mgmt.c
index 50634ef5c8b70,b9c53810bf06b..0000000000000
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-17 11:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-17 11:34 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-12 13:14 linux-next: manual merge of the bluetooth tree with the origin tree Mark Brown
2025-09-22 9:23 Mark Brown
2023-04-17 14:36 broonie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aMqcrced3cFk9SCl@sirena.org.uk \
--to=broonie@kernel.org \
--cc=johan.hedberg@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luiz.von.dentz@intel.com \
--cc=marcel@holtmann.org \
--cc=pashpakovskii@salutedevices.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox