public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marcel Holtmann <marcel@holtmann•org>,
	Johan Hedberg <johan.hedberg@gmail•com>,
	David Miller <davem@davemloft•net>,
	Jakub Kicinski <kuba@kernel•org>
Cc: Networking <netdev@vger•kernel.org>,
	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: Thu, 8 Jun 2023 10:47:28 +1000	[thread overview]
Message-ID: <20230608104728.0be82edd@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1797 bytes --]

Hi all,

The following commits are also in the net tree as different
commits (but the same patches):

  f014353b6737 ("Bluetooth: L2CAP: Add missing checks for invalid DCID")
  1e309a698c05 ("Bluetooth: ISO: use correct CIS order in Set CIG Parameters event")
  3a6c71cd5238 ("Bluetooth: ISO: don't try to remove CIG if there are bound CIS left")
  5fb7bb517c03 ("Bluetooth: Fix l2cap_disconnect_req deadlock")
  f08424123e94 ("Bluetooth: hci_qca: fix debugfs registration")
  4a3c39cbee7c ("Bluetooth: fix debugfs registration")
  49d0d4d86bfb ("Bluetooth: hci_sync: add lock to protect HCI_UNREGISTER")
  b4a17f5ec28a ("Bluetooth: Fix use-after-free in hci_remove_ltk/hci_remove_irk")
  695398e3d1f5 ("Bluetooth: ISO: Fix CIG auto-allocation to select configurable CIG")
  41ed839d161a ("Bluetooth: ISO: consider right CIS when removing CIG at cleanup")

these are commits

  75767213f3d9 ("Bluetooth: L2CAP: Add missing checks for invalid DCID")
  71e9588435c3 ("Bluetooth: ISO: use correct CIS order in Set CIG Parameters event")
  6c242c64a09e ("Bluetooth: ISO: don't try to remove CIG if there are bound CIS left")
  02c5ea5246a4 ("Bluetooth: Fix l2cap_disconnect_req deadlock")
  47c5d829a3e3 ("Bluetooth: hci_qca: fix debugfs registration")
  fe2ccc6c29d5 ("Bluetooth: fix debugfs registration")
  1857c19941c8 ("Bluetooth: hci_sync: add lock to protect HCI_UNREGISTER")
  c5d2b6fa26b5 ("Bluetooth: Fix use-after-free in hci_remove_ltk/hci_remove_irk")
  e6a7a46b8636 ("Bluetooth: ISO: Fix CIG auto-allocation to select configurable CIG")
  31c5f9164949 ("Bluetooth: ISO: consider right CIS when removing CIG at cleanup")

in the net tree

These have already caused one unnecessary conflict when merging the
bluetooth tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2023-06-08  0:47 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-08  0:47 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-01-04 21:48 linux-next: duplicate patches in the bluetooth tree Stephen Rothwell
2025-11-12 23:44 Stephen Rothwell
2025-10-28 23:31 Stephen Rothwell
2025-09-02  1:23 Stephen Rothwell
2025-08-25  1:06 Stephen Rothwell
2025-08-18  0:51 Stephen Rothwell
2025-07-02  2:12 Stephen Rothwell
2025-06-25  1:16 Stephen Rothwell
2025-06-25  7:24 ` Paolo Abeni
2025-06-12 22:10 Stephen Rothwell
2025-06-10  2:26 Stephen Rothwell
2025-06-03  4:02 Stephen Rothwell
2025-05-21  3:53 Stephen Rothwell
2025-04-30  2:44 Stephen Rothwell
2025-04-14  3:07 Stephen Rothwell
2025-03-20  1:12 Stephen Rothwell
2025-03-11  2:04 Stephen Rothwell
2025-03-03  1:25 Stephen Rothwell
2025-02-27 20:42 Stephen Rothwell
2025-02-24  2:17 Stephen Rothwell
2025-02-13 21:19 Stephen Rothwell
2025-01-31  2:16 Stephen Rothwell
2025-01-31  7:37 ` Paolo Abeni
2025-01-10  0:44 Stephen Rothwell
2024-12-08 20:39 Stephen Rothwell
2024-11-14  0:54 Stephen Rothwell
2024-10-25  2:09 Stephen Rothwell
2024-10-21  6:43 Stephen Rothwell
2024-10-09  0:49 Stephen Rothwell
2024-10-03 22:42 Stephen Rothwell
2024-09-04  2:28 Stephen Rothwell
2024-08-27  1:27 Stephen Rothwell
2024-08-19  1:01 Stephen Rothwell
2024-08-23  3:56 ` Stephen Rothwell
2024-08-08 22:49 Stephen Rothwell
2024-07-28 23:56 Stephen Rothwell
2024-07-02  1:47 Stephen Rothwell
2024-06-13  0:53 Stephen Rothwell
2024-04-25 21:09 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-30  0:21 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=20230608104728.0be82edd@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=davem@davemloft$(echo .)net \
    --cc=johan.hedberg@gmail$(echo .)com \
    --cc=kuba@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=marcel@holtmann$(echo .)org \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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