From: Stephen Rothwell <sfr@canb.auug.org.au>
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>
Subject: linux-next: duplicate patches in the bluetooth tree
Date: Fri, 30 Jun 2023 10:21:39 +1000 [thread overview]
Message-ID: <20230630102139.12a3ce8d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1694 bytes --]
Hi all,
The following commits are also in net tree as different commits (but
the same patches):
0d4cc72dd9db ("Bluetooth: hci_bcm: do not mark valid bd_addr as invalid")
1155a833ed0d ("Bluetooth: MGMT: Fix marking SCAN_RSP as not connectable")
14dc3f27c944 ("Bluetooth: btrtl: Add missing MODULE_FIRMWARE declarations")
15d74ca10a2e ("Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb")
289bfc8d7dfd ("Bluetooth: L2CAP: Fix use-after-free")
3945d329465e ("Bluetooth: ISO: Rework sync_interval to be sync_factor")
41696c5c9627 ("Bluetooth: hci_event: fix Set CIG Parameters error status handling")
49c5fe08def9 ("Bluetooth: btusb: Add MT7922 bluetooth ID for the Asus Ally")
5a06716bc727 ("Bluetooth: fix use-bdaddr-property quirk")
7a26cd876524 ("Bluetooth: hci_sysfs: make bt_class a static const structure")
8900ccc56ad3 ("Bluetooth: btusb: Add device 6655:8771 to device tables")
b3d9018d9254 ("Bluetooth: fix invalid-bdaddr quirk for non-persistent setup")
dbc333d3abdf ("Bluetooth: btqca: use le32_to_cpu for ver.soc_id")
eee96e90b646 ("Bluetooth: hci_conn: Use kmemdup() to replace kzalloc + memcpy")
Some of these are causing unnecessary conflicts when I merge the
bluetooth tree. Is there anything in the bluetooth tree (that is not in
the net-next or net trees) that is destined for the current merge window?
If not, then please just rename the master branch to something else and
recreate a new master branch to be somewhere in Linus' tree or the net-dev
tree until after the merge window closes.
I am also still reverting "Bluetooth: hci_sock: Forward credentials
to monitor".
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-06-30 0:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 0:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-25 21:09 linux-next: duplicate patches in the bluetooth tree Stephen Rothwell
2024-05-06 1:33 ` Stephen Rothwell
2024-04-11 21:34 Stephen Rothwell
2024-04-01 23:37 Stephen Rothwell
2024-02-29 22:25 Stephen Rothwell
2023-12-21 1:24 Stephen Rothwell
2023-12-21 21:41 ` Stephen Rothwell
2023-10-18 3:14 Stephen Rothwell
2023-10-19 21:23 ` Stephen Rothwell
2023-10-05 22:02 Stephen Rothwell
2023-10-03 1:19 Stephen Rothwell
2023-07-23 22:44 Stephen Rothwell
2023-07-06 2:35 Stephen Rothwell
2023-06-08 0:47 Stephen Rothwell
2023-05-29 21:59 Stephen Rothwell
2023-03-24 1:21 Stephen Rothwell
2023-03-26 20:47 ` Stephen Rothwell
2023-01-19 0:48 Stephen Rothwell
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=20230630102139.12a3ce8d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=johan.hedberg@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcel@holtmann.org \
/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;
as well as URLs for NNTP newsgroup(s).