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: Re: linux-next: duplicate patches in the bluetooth tree
Date: Mon, 6 May 2024 11:33:34 +1000 [thread overview]
Message-ID: <20240506113334.2a04044e@canb.auug.org.au> (raw)
In-Reply-To: <20240426070902.0cfa1282@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]
Hi all,
On Fri, 26 Apr 2024 07:09:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
>
> 2d7a4bf4bae8 ("Bluetooth: qca: fix NULL-deref on non-serdev suspend")
> 4405182b7a15 ("Bluetooth: hci_sync: Use advertised PHYs on hci_le_ext_create_conn_sync")
> 5a0265dc7990 ("Bluetooth: hci_sync: Using hci_cmd_sync_submit when removing Adv Monitor")
> 5e7d1e242697 ("Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional()")
> 9c049d8a7595 ("Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()")
> a3aca621101b ("Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID")
> aec46cd4ebff ("Bluetooth: qca: fix invalid device address check")
> d19d765596e7 ("Bluetooth: hci_event: Fix sending HCI_OP_READ_ENC_KEY_SIZE")
> df5efbdaa7d5 ("Bluetooth: btusb: mediatek: Fix double free of skb in coredump")
> e10bb8abb81e ("Bluetooth: qca: fix NULL-deref on non-serdev setup")
> e4e20e0a1700 ("Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bda:0x4853")
> f33b1c9d33d9 ("Bluetooth: btusb: Fix triggering coredump implementation for QCA")
These are now causing unnecessary conflicts :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-05-06 1:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 21:09 linux-next: duplicate patches in the bluetooth tree Stephen Rothwell
2024-05-06 1:33 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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-30 0:21 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=20240506113334.2a04044e@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 read-only IMAP folder(s) and NNTP newsgroup(s).