Received-SPF: pass (google.com: domain of linux-kernel+bounces-169231-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 6 May 2024 11:33:34 +1000
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
Message-ID: <20240506113334.2a04044e@canb.auug.org.au>
In-Reply-To: <20240426070902.0cfa1282@canb.auug.org.au>
References: <20240426070902.0cfa1282@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Q6r_7dtV5MzWWikJ=JPh=vd";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Q6r_7dtV5MzWWikJ=JPh=vd
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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):
>=20
>   2d7a4bf4bae8 ("Bluetooth: qca: fix NULL-deref on non-serdev suspend")
>   4405182b7a15 ("Bluetooth: hci_sync: Use advertised PHYs on hci_le_ext_c=
reate_conn_sync")
>   5a0265dc7990 ("Bluetooth: hci_sync: Using hci_cmd_sync_submit when remo=
ving 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_getsockop=
t_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_SI=
ZE")
>   df5efbdaa7d5 ("Bluetooth: btusb: mediatek: Fix double free of skb in co=
redump")
>   e10bb8abb81e ("Bluetooth: qca: fix NULL-deref on non-serdev setup")
>   e4e20e0a1700 ("Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bd=
a:0x4853")
>   f33b1c9d33d9 ("Bluetooth: btusb: Fix triggering coredump implementation=
 for QCA")

These are now causing unnecessary conflicts :-(

--=20
Cheers,
Stephen Rothwell

--Sig_/Q6r_7dtV5MzWWikJ=JPh=vd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY4M24ACgkQAVBC80lX
0GzgaQf/eR8m2lvct6913jGJhXadM+UnB0wLnMYnSTB1r7TJiMe+79hIlGnwMQ08
ROYkhVMUPb2m/1K43OW1nPP/AMRjHMB1HvyQuZ7s43auf0ml4sHRwTT8V/LnN0F6
Qssx9ntpElTUXxlbfNrZ63romrbB2VWForZfRDRA3couhcpBvuaITaJ0hyrFJIgW
oudkahPOfMkKracaX4z0hmFIA+5KLBZtDWvADbWs5piOmCShGsx4TKgAidXsTxT2
hLa5Gw4BILEZzzToJhSMkt6olH7ZFStVNAkQ8Ke6X7dy3BXX++qWxbmvVlfFqUX0
5iBIdFGwJ6wFWcsBF7m3zh3xEa1WCA==
=Y0oU
-----END PGP SIGNATURE-----

--Sig_/Q6r_7dtV5MzWWikJ=JPh=vd--