linux-next: duplicate patches in the bluetooth tree

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  08e664b73363 ("Bluetooth: ISO: Fix possible circular locking dependency")
  489691e98909 ("Bluetooth: ISO: Fix possible circular locking dependency")
  5d043a6a43b6 ("Bluetooth: hci_conn: Fix memory leaks")
  711d2d5f3b42 ("Bluetooth: hci_sync: Fix use HCI_OP_LE_READ_BUFFER_SIZE_V2")
  7ed38304a633 ("Bluetooth: Fix possible deadlock in rfcomm_sk_state_change")
  a18fca670e14 ("Bluetooth: hci_qca: Fix driver shutdown on closed serdev")
  becee9f3220c ("Bluetooth: Fix a buffer overflow in mgmt_mesh_add()")
  e8b5fd71713b ("Bluetooth: hci_sync: fix memory leak in hci_update_adv_data()")
  fd18e1680ee2 ("Bluetooth: hci_event: Fix Invalid wait context")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  0b0501e48331 ("Bluetooth: Fix race condition in hci_cmd_sync_clear")
  1446dcd9dcfc ("Bluetooth: btintel: Iterate only bluetooth device ACPI entries")
  23942ce75b8c ("Bluetooth: L2CAP: Fix responding with wrong PDU type")
  363bb3fbb249 ("Bluetooth: hci_core: Detect if an ACL packet is in fact an ISO packet")
  36ecf4d48b5a ("Bluetooth: btusb: Remove detection of ISO packets over bulk")
  3ebbba4feafd ("Bluetooth: btqcomsmd: Fix command timeout after setting BD address")
  592916198977 ("Bluetooth: ISO: fix timestamped HCI ISO data packet parsing")
  59ba62c59bfe ("Bluetooth: HCI: Fix global-out-of-bounds")
  6eaae76b4aed ("Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work")
  81183a159b36 ("Bluetooth: hci_sync: Resume adv with no RPA when active scan")
  853c3e629079 ("Bluetooth: mgmt: Fix MGMT add advmon with RSSI command")
  906d721e4897 ("Bluetooth: btinel: Check ACPI handle for NULL before accessing")
  bfcd8f0d273d ("Bluetooth: Remove "Power-on" check from Mesh feature")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Fri, 24 Mar 2023 12:21:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in the net tree as different commits
> (but the same patches):
> 
>   0b0501e48331 ("Bluetooth: Fix race condition in hci_cmd_sync_clear")
>   1446dcd9dcfc ("Bluetooth: btintel: Iterate only bluetooth device ACPI entries")
>   23942ce75b8c ("Bluetooth: L2CAP: Fix responding with wrong PDU type")
>   363bb3fbb249 ("Bluetooth: hci_core: Detect if an ACL packet is in fact an ISO packet")
>   36ecf4d48b5a ("Bluetooth: btusb: Remove detection of ISO packets over bulk")
>   3ebbba4feafd ("Bluetooth: btqcomsmd: Fix command timeout after setting BD address")
>   592916198977 ("Bluetooth: ISO: fix timestamped HCI ISO data packet parsing")
>   59ba62c59bfe ("Bluetooth: HCI: Fix global-out-of-bounds")
>   6eaae76b4aed ("Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work")
>   81183a159b36 ("Bluetooth: hci_sync: Resume adv with no RPA when active scan")
>   853c3e629079 ("Bluetooth: mgmt: Fix MGMT add advmon with RSSI command")
>   906d721e4897 ("Bluetooth: btinel: Check ACPI handle for NULL before accessing")
>   bfcd8f0d273d ("Bluetooth: Remove "Power-on" check from Mesh feature")

These commits are now in Linus' tree as different commits but the same patches.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  78c8f6e2d7d7 ("Bluetooth: btnxpuart: Fix compiler warnings")
  e6e576ec4e72 ("Bluetooth: Unlink CISes when LE disconnects in hci_conn_del")
  29f883dcbfd0 ("Bluetooth: Fix UAF in hci_conn_hash_flush again")
  38e9b45310de ("Bluetooth: Refcnt drop must be placed last in hci_conn_unlink")
  3214238e9dc7 ("Bluetooth: Fix potential double free caused by hci_conn_unlink")

These are commits

  6ce5169e05aa ("Bluetooth: btnxpuart: Fix compiler warnings")
  a2904d282553 ("Bluetooth: Unlink CISes when LE disconnects in hci_conn_del")
  a2ac591cb4d8 ("Bluetooth: Fix UAF in hci_conn_hash_flush again")
  2910431ab0e5 ("Bluetooth: Refcnt drop must be placed last in hci_conn_unlink")
  ca1fd42e7dbf ("Bluetooth: Fix potential double free caused by hci_conn_unlink")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

[-- 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 --]

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

[-- 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 --]

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' 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")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  1097b9b5a14b ("Bluetooth: hci_event: call disconnect callback before deleting conn")
  1a43e2538e5a ("Bluetooth: ISO: fix iso_conn related locking and validity issues")
  2a9bc19e9d39 ("Bluetooth: use RCU for hci_conn_params and iterate safely in hci_sync")
  45018a3caf9b ("Bluetooth: coredump: fix building with coredump disabled")
  5beaf842b507 ("Bluetooth: SCO: fix sco_conn related locking and validity issues")
  64068b2b948a ("Bluetooth: MGMT: Use correct address for memcpy()")
  752a4a227d35 ("Bluetooth: btusb: Fix bluetooth on Intel Macbook 2014")
  7728d4d43b78 ("Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_remove_adv_monitor()")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  0ef9e5c1af4c ("Bluetooth: ISO: Fix handling of listen for unicast")
  190b32220f99 ("Bluetooth: btusb: add shutdown function for QCA6174")
  2eb5e4369bc4 ("Bluetooth: Avoid redundant authentication")
  8ee19a4f17bc ("Bluetooth: hci_core: Fix build warnings")
  9f0fcb5aa550 ("Bluetooth: Fix hci_link_tx_to RCU lock usage")
  b78e04e5f353 ("Bluetooth: Delete unused hci_req_prepare_suspend() declaration")
  c0c64dc267e4 ("Bluetooth: hci_codec: Fix leaking content of local_codecs")
  da10fc7a9dc3 ("Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  0ef9e5c1af4c ("Bluetooth: ISO: Fix handling of listen for unicast")
  190b32220f99 ("Bluetooth: btusb: add shutdown function for QCA6174")
  2eb5e4369bc4 ("Bluetooth: Avoid redundant authentication")
  8ee19a4f17bc ("Bluetooth: hci_core: Fix build warnings")
  9f0fcb5aa550 ("Bluetooth: Fix hci_link_tx_to RCU lock usage")
  b78e04e5f353 ("Bluetooth: Delete unused hci_req_prepare_suspend() declaration")
  c0c64dc267e4 ("Bluetooth: hci_codec: Fix leaking content of local_codecs")
  da10fc7a9dc3 ("Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  0ebb3699b15d ("Bluetooth: vhci: Fix race when opening vhci device")
  19cb846d0b71 ("Bluetooth: hci_event: Fix using memcmp when comparing keys")
  27eb5c50277f ("Bluetooth: hci_event: Ignore NULL link key")
  354eeee644a0 ("Bluetooth: Fix a refcnt underflow problem for hci_conn")
  4025ddca4aa6 ("Bluetooth: ISO: Fix invalid context error")
  47d973dff74e ("Bluetooth: hci_sock: fix slab oob read in create_monitor_event")
  505fc3b0f198 ("Bluetooth: btrtl: Ignore error return for hci_devcd_register()")
  58250a6dc86d ("Bluetooth: Reject connection with the device which has same BD_ADDR")
  81a220a6c891 ("Bluetooth: hci_event: Fix coding style")
  a86e2622de15 ("Bluetooth: avoid memcmp() out of bounds warning")
  bbb24b6a681b ("Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Wed, 18 Oct 2023 14:14:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in the net tree as different
> commits (but the same patches):
> 
>   0ebb3699b15d ("Bluetooth: vhci: Fix race when opening vhci device")
>   19cb846d0b71 ("Bluetooth: hci_event: Fix using memcmp when comparing keys")
>   27eb5c50277f ("Bluetooth: hci_event: Ignore NULL link key")
>   354eeee644a0 ("Bluetooth: Fix a refcnt underflow problem for hci_conn")
>   4025ddca4aa6 ("Bluetooth: ISO: Fix invalid context error")
>   47d973dff74e ("Bluetooth: hci_sock: fix slab oob read in create_monitor_event")
>   505fc3b0f198 ("Bluetooth: btrtl: Ignore error return for hci_devcd_register()")
>   58250a6dc86d ("Bluetooth: Reject connection with the device which has same BD_ADDR")
>   81a220a6c891 ("Bluetooth: hci_event: Fix coding style")
>   a86e2622de15 ("Bluetooth: avoid memcmp() out of bounds warning")
>   bbb24b6a681b ("Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name")

These patches are now in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  01edddb9f366 ("Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis")
  27a4852d53c1 ("Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent")
  315a4c9045df ("Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg")
  37044639ad5e ("Bluetooth: hci_event: shut up a false-positive warning")
  6ab75888baf7 ("Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE")
  8127ee3d7e0f ("Bluetooth: Fix not notifying when connection encryption changes")
  8d79bc35fb81 ("Bluetooth: Fix deadlock in vhci_send_frame")
  aaa600f30fad ("Bluetooth: Add more enc key size check")
  b207711da3d7 ("Bluetooth: L2CAP: Send reject on command corrupted request")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Thu, 21 Dec 2023 12:24:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in the net tree as different commits
> (but the same patches):
> 
>   01edddb9f366 ("Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis")
>   27a4852d53c1 ("Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent")
>   315a4c9045df ("Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg")
>   37044639ad5e ("Bluetooth: hci_event: shut up a false-positive warning")
>   6ab75888baf7 ("Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE")
>   8127ee3d7e0f ("Bluetooth: Fix not notifying when connection encryption changes")
>   8d79bc35fb81 ("Bluetooth: Fix deadlock in vhci_send_frame")
>   aaa600f30fad ("Bluetooth: Add more enc key size check")
>   b207711da3d7 ("Bluetooth: L2CAP: Send reject on command corrupted request")

These are now duplicating commits in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  2d958ee64d5e ("Bluetooth: qca: Fix triggering coredump implementation")
  30a746ee2438 ("Bluetooth: Enforce validation on max value of connection interval")
  464f888b0534 ("Bluetooth: hci_sync: Check the correct flag before starting a scan")
  5197b25a3803 ("Bluetooth: hci_sync: Fix accept_list when attempting to suspend")
  51fda2df0c7a ("Bluetooth: mgmt: Fix limited discoverable off timeout")
  571dd44ebd09 ("Bluetooth: hci_event: Fix wrongly recorded wakeup BD_ADDR")
  5befbb8e4260 ("Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST")
  83fd7383955f ("Bluetooth: hci_bcm4377: do not mark valid bd_addr as invalid")
  b44647f271b1 ("Bluetooth: Avoid potential use-after-free in hci_error_reset")
  c64e95bdf43b ("Bluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security")
  dae9093faed4 ("Bluetooth: qca: Fix wrong event type for patch config command")
  e8aacc745769 ("Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  019b9f7b4ed6 ("dt-bindings: bluetooth: add 'qcom,local-bd-address-broken'")
  19b8ed600761 ("Bluetooth: add quirk for broken address properties")
  1c3366abdbe8 ("Bluetooth: hci_sync: Fix not checking error on hci_cmd_sync_cancel_sync")
  399a043aaa60 ("Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"")
  a2a52ae8fe1f ("Bluetooth: hci_event: set the conn encrypted before conn establishes")
  b8f2609aee86 ("arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken")
  d39a2734bf62 ("Bluetooth: qca: fix device-address endianness")
  db4597cc88b2 ("Bluetooth: Fix TOCTOU in HCI debugfs implementation")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  01841038e1d2 ("Bluetooth: Fix memory leak in hci_req_sync_complete()")
  2151391668d9 ("Bluetooth: ISO: Don't reject BT_ISO_QOS if parameters are unset")
  289bfd91fcf2 ("Bluetooth: SCO: Fix not validating setsockopt user input")
  35d2c39b23ff ("Bluetooth: hci_sock: Fix not validating setsockopt user input")
  5a5010485400 ("Bluetooth: ISO: Fix not validating setsockopt user input")
  a95f9d212d1b ("Bluetooth: L2CAP: Fix not validating setsockopt user input")
  b191fb7a3075 ("Bluetooth: hci_sync: Fix using the same interval and window for Coded PHY")
  e6bb15dbae90 ("Bluetooth: l2cap: Don't double set the HCI_CONN_MGMT_CONNECTED bit")
  ee77912bc0bb ("Bluetooth: RFCOMM: Fix not validating setsockopt user input")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

[-- 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 --]

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  04ac7662d391 ("Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ")
  5fe0be8868aa ("Bluetooth: fix connection setup in l2cap_connect")
  9dff76b7f8bc ("Bluetooth: hci_sync: Fix not using correct handle")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the net tree (I think - I didn;t check
them all) as different commits (but the same patches):

  1754e2144739 ("Bluetooth: hci_core: cancel all works upon hci_unregister_dev()")
  1fc73da90b52 ("bluetooth/hci: disallow setting handle bigger than HCI_CONN_HANDLE_MAX")
  39a92a55be13 ("bluetooth/l2cap: sync sock recv cb and release")
  48bdb4085485 ("Bluetooth: hci_event: Fix setting of unicast qos interval")
  4b5e8d5635bd ("Bluetooth: Add quirk to ignore reserved PHY bits in LE Extended Adv Report")
  7274f7479942 ("Bluetooth: hci_bcm4377: Fix msgid release")
  7bc60457138b ("Bluetooth: btintel_pcie: Fix REVERSE_INULL issue reported by coverity")
  94a60402b1c1 ("Bluetooth: Ignore too large handle values in BIG")
  bafd12aba679 ("Bluetooth: btnxpuart: Enable Power Save feature on startup")
  c54bcd8a2f9c ("Bluetooth: ISO: Check socket flag instead of hcon")
  f305a9bafe14 ("Bluetooth: qca: Fix BT enable failure again for QCA6390 after warm reboot")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  0c9b6e2f7742 ("Bluetooth: btmtk: Fix kernel crash when entering btmtk_usb_suspend")
  0f6bd069a04a ("Bluetooth: btmtk: Fix btmtk.c undefined reference build error harder")
  3a493d96e81c ("Bluetooth: btmtk: remove #ifdef around declarations")
  52828ea60dfd ("Bluetooth: btmtk: Fix btmtk.c undefined reference build error")
  54dd4796336d ("Bluetooth: hci_sync: Fix suspending with wrong filter policy")
  7a27b0ac58ab ("Bluetooth: hci_event: Fix setting DISCOVERY_FINDING for passive scanning")
  e0b0a863028e ("Bluetooth: btintel: Fail setup on error")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  1e69bd3ba19c ("Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()")
  2360f368524b ("Bluetooth: hci_sync: avoid dup filtering when passive scanning with adv monitor")
  3c9b2c902da0 ("Bluetooth: hci_qca: don't call pwrseq_power_off() twice for QCA6390")
  786cd197c92b ("Bluetooth: hci_qca: fix QCA6390 support on non-DT platforms")
  9fba2e3f4ac1 ("Bluetooth: hci_qca: fix a NULL-pointer derefence at shutdown")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  01bcdf3cfddb ("Bluetooth: SMP: Fix assumption of Central always being Initiator")
  7285ef081977 ("Bluetooth: MGMT: Add error handling to pair_device()")
  8ccaf1a2bf4a ("Bluetooth: HCI: Invert LE State quirk to be opt-out rather then opt-in")
  96ddcf0e9e5b ("Bluetooth: hci_core: Fix LE quote calculation")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

On Mon, 19 Aug 2024 11:01:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> The following commits are also in the net tree as different commits
> (but the same patches):
> 
>   01bcdf3cfddb ("Bluetooth: SMP: Fix assumption of Central always being Initiator")
>   7285ef081977 ("Bluetooth: MGMT: Add error handling to pair_device()")
>   8ccaf1a2bf4a ("Bluetooth: HCI: Invert LE State quirk to be opt-out rather then opt-in")
>   96ddcf0e9e5b ("Bluetooth: hci_core: Fix LE quote calculation")

These are now also in Linus' tree.
-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  7567b7da175b ("Bluetooth: btintel: Allow configuring drive strength of BRI")
  9f5a21d9963d ("Bluetooth: btnxpuart: Fix random crash seen while removing dri
  1594ee3e104f ("Bluetooth: hci_core: Fix not handling hibernation actions")

These are commits

  eb9e749c0182 ("Bluetooth: btintel: Allow configuring drive strength of BRI")
  35237475384a ("Bluetooth: btnxpuart: Fix random crash seen while removing driver")
  18b3256db76b ("Bluetooth: hci_core: Fix not handling hibernation actions")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  80d2d2dbcce7 ("Bluetooth: MGMT: Ignore keys being loaded with invalid type")
  4e76e85acacd ("Revert "Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE"")
  5785ffa39009 ("Bluetooth: MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT")
  4dd2c5007a2b ("Bluetooth: hci_sync: Introduce hci_cmd_sync_run/hci_cmd_sync_run_once")
  61bea6923172 ("Bluetooth: qca: If memdump doesn't work, re-enable IBS")

These are commits

  1e9683c9b6ca ("Bluetooth: MGMT: Ignore keys being loaded with invalid type")
  532f8bcd1c2c ("Revert "Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE"")
  227a0cdf4a02 ("Bluetooth: MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT")
  c898f6d7b093 ("Bluetooth: hci_sync: Introduce hci_cmd_sync_run/hci_cmd_sync_run_once")
  8ae22de9d2ea ("Bluetooth: qca: If memdump doesn't work, re-enable IBS")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  370e38c32529 ("Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE")
  f9c212dd4eb4 ("Bluetooth: btmrvl: Use IRQF_NO_AUTOEN flag in request_irq()")
  d93544ba0cd8 ("Bluetooth: L2CAP: Fix uaf in l2cap_connect")
  eb3ad76a07b6 ("Bluetooth: MGMT: Fix possible crash on mgmt_index_removed")

These are commits

  b25e11f978b6 ("Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE")
  7b1ab460592c ("Bluetooth: btmrvl: Use IRQF_NO_AUTOEN flag in request_irq()")
  333b4fd11e89 ("Bluetooth: L2CAP: Fix uaf in l2cap_connect")
  f53e1c9c726d ("Bluetooth: MGMT: Fix possible crash on mgmt_index_removed")

In Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  81b3e33bb054 ("Bluetooth: btusb: Don't fail external suspend requests")
  a691ff3d3280 ("Bluetooth: hci_conn: Fix UAF in hci_enhanced_setup_sync")
  ffb3f98d4dae ("Bluetooth: RFCOMM: FIX possible deadlock in rfcomm_sk_state_change")

These are commits

  610712298b11 ("Bluetooth: btusb: Don't fail external suspend requests")
  18fd04ad856d ("Bluetooth: hci_conn: Fix UAF in hci_enhanced_setup_sync")
  08d1914293da ("Bluetooth: RFCOMM: FIX possible deadlock in rfcomm_sk_state_change")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  b29d4ac72975 ("Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001")
  c444fd3ff73a ("Bluetooth: bnep: fix wild-memory-access in proto_unregister")
  a2ce7481010a ("Bluetooth: btusb: Fix not being able to reconnect after suspend")
  dac9e8edebeb ("Bluetooth: Remove debugfs directory on module init failure")
  d1e168910fcc ("Bluetooth: Call iso_exit() on module unload")
  d990b50fd7b8 ("Bluetooth: ISO: Fix multiple init when debugfs is disabled")

These are commits

  2c1dda2acc41 ("Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001")
  64a90991ba8d ("Bluetooth: bnep: fix wild-memory-access in proto_unregister")
  4084286151fc ("Bluetooth: btusb: Fix not being able to reconnect after suspend")
  1db4564f101b ("Bluetooth: Remove debugfs directory on module init failure")
  d458cd1221e9 ("Bluetooth: Call iso_exit() on module unload")
  a9b7b535ba19 ("Bluetooth: ISO: Fix multiple init when debugfs is disabled")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  fb4560832d4c ("Bluetooth: ISO: Fix UAF on iso_sock_timeout")
  300b75192c4d ("Bluetooth: SCO: Fix UAF on sco_sock_timeout")
  92e242adc4ac ("Bluetooth: hci_core: Disable works on hci_unregister_dev")

These are commits

  246b435ad668 ("Bluetooth: ISO: Fix UAF on iso_sock_timeout")
  1bf4470a3939 ("Bluetooth: SCO: Fix UAF on sco_sock_timeout")
  989fa5171f00 ("Bluetooth: hci_core: Disable works on hci_unregister_dev")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  e88b020190bf ("Bluetooth: btintel: Direct exception event to bluetooth stack")
  48adce305dc6 ("Bluetooth: hci_core: Fix calling mgmt_device_connected")

These are commits

  d5359a7f583a ("Bluetooth: btintel: Direct exception event to bluetooth stack")
  7967dc8f797f ("Bluetooth: hci_core: Fix calling mgmt_device_connected")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  ad0d88dc33bb ("Bluetooth: SCO: remove the redundant sco_conn_put")
  4ae007fdffc9 ("Bluetooth: MGMT: Fix possible deadlocks")
  4f562bec2bbf ("Bluetooth: MGMT: Fix slab-use-after-free Read in set_powered_sync")

These are commits

  ed9588554943 ("Bluetooth: SCO: remove the redundant sco_conn_put")
  a66dfaf18fd6 ("Bluetooth: MGMT: Fix possible deadlocks")
  0b882940665c ("Bluetooth: MGMT: Fix slab-use-after-free Read in set_powered_sync")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  0eb19b741e48 ("Bluetooth: btmtk: Fix failed to send func ctrl for MediaTek devices.")
  fb966c19be55 ("Bluetooth: btnxpuart: Fix driver sending truncated data")
  fcd17fe2deb9 ("Bluetooth: MGMT: Fix Add Device to responding before completing")
  e8e5b0502559 ("Bluetooth: hci_sync: Fix not setting Random Address when required")

These are commits

  67dba2c28fe0 ("Bluetooth: btmtk: Fix failed to send func ctrl for MediaTek devices.")
  8023dd220425 ("Bluetooth: btnxpuart: Fix driver sending truncated data")
  a182d9c84f9c ("Bluetooth: MGMT: Fix Add Device to responding before completing")
  c2994b008492 ("Bluetooth: hci_sync: Fix not setting Random Address when required")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  07b6216dfc34 ("Bluetooth: Add ABI doc for sysfs reset")
  52f17be9931e ("Bluetooth: btnxpuart: Fix glitches seen in dual A2DP streaming")
  56cec66d6163 ("Bluetooth: L2CAP: accept zero as a special value for MTU auto-selection")
  9e2714de7384 ("Bluetooth: Fix possible infinite recursion of btusb_reset")
  ec5570088c6a ("Bluetooth: btusb: mediatek: Add locks for usb_driver_claim_interface()")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Paolo Abeni]

Hi,

On 1/31/25 3:16 AM, Stephen Rothwell wrote:
> The following commits are also in the net tree as different commits
> (but the same patches):
> 
>   07b6216dfc34 ("Bluetooth: Add ABI doc for sysfs reset")
>   52f17be9931e ("Bluetooth: btnxpuart: Fix glitches seen in dual A2DP streaming")
>   56cec66d6163 ("Bluetooth: L2CAP: accept zero as a special value for MTU auto-selection")
>   9e2714de7384 ("Bluetooth: Fix possible infinite recursion of btusb_reset")
>   ec5570088c6a ("Bluetooth: btusb: mediatek: Add locks for usb_driver_claim_interface()")

I pulled from:

git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
tags/for-net-2025-01-29

AFAICS net hashes match the above tag. @Luiz: did you by chance rebased
your tree before tagging it and sending the PR? Just to understand the
root cause of the above difference.

Thanks,

Paolo

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  37d0ec8e50ca ("Bluetooth: btintel_pcie: Fix a potential race condition")
  6ab54a717189 ("Bluetooth: L2CAP: Fix slab-use-after-free Read in l2cap_send_cmd")
  a6b7c150b32a ("Bluetooth: L2CAP: Fix corrupted list in hci_chan_del")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  2a509818ec2d ("Bluetooth: L2CAP: Fix L2CAP_ECRED_CONN_RSP response")
  980d6e2904df ("Bluetooth: Always allow SCO packets for user channel")

These are commits

  b25120e1d5f2 ("Bluetooth: L2CAP: Fix L2CAP_ECRED_CONN_RSP response")
  bd30e8d7bfa6 ("Bluetooth: Always allow SCO packets for user channel")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  2a509818ec2d ("Bluetooth: L2CAP: Fix L2CAP_ECRED_CONN_RSP response")
  980d6e2904df ("Bluetooth: Always allow SCO packets for user channel")

These are commits

  b25120e1d5f2 ("Bluetooth: L2CAP: Fix L2CAP_ECRED_CONN_RSP response")
  bd30e8d7bfa6 ("Bluetooth: Always allow SCO packets for user channel")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  a4ce2f1cceba ("Bluetooth: Add check for mgmt_alloc_skb() in mgmt_device_connected()")
  62ee156d6b29 ("Bluetooth: Add check for mgmt_alloc_skb() in mgmt_remote_name()")
  02aa832d1403 ("bluetooth: btusb: Initialize .owner field of force_poll_sync_fops")

These are comits

  d8df010f72b8 ("Bluetooth: Add check for mgmt_alloc_skb() in mgmt_device_connected()")
  f2176a07e7b1 ("Bluetooth: Add check for mgmt_alloc_skb() in mgmt_remote_name()")
  cbf85b9cb80b ("bluetooth: btusb: Initialize .owner field of force_poll_sync_fops")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  01aa72784e50 ("Bluetooth: SCO: fix sco_conn refcounting on sco_conn_ready")
  8da76b2ac810 ("Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context"")
  c01c0d443bcd ("Bluetooth: btusb: Configure altsetting for HCI_USER_CHANNEL")
  c7c65369f5a3 ("Bluetooth: hci_event: Fix enabling passive scanning")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  712e0e2e6abf ("Bluetooth: hci_event: Fix connection regression between LE and non-LE adapters")
  d0239dfa783c ("Bluetooth: Fix error code in chan_alloc_skb_cb()")

These are commits

  f6685a96c8c8 ("Bluetooth: hci_event: Fix connection regression between LE and non-LE adapters")
  72d061ee630d ("Bluetooth: Fix error code in chan_alloc_skb_cb()")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  50c1241e6a8a ("Bluetooth: l2cap: Check encryption key size on incoming connection")
  061e4972c48c ("Bluetooth: btnxpuart: Add an error message if FW dump trigger fails")
  17931d1b6d0c ("Bluetooth: btnxpuart: Revert baudrate change in nxp_shutdown")
  2c1cf148c1fa ("Bluetooth: increment TX timestamping tskey always for stream sockets")
  87d48ed16c9f ("Bluetooth: qca: fix NV variant for one of WCN3950 SoCs")
  113f1345ce0c ("Bluetooth: btrtl: Prevent potential NULL dereference")
  32b70317f41c ("Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address")

These are commits

  522e9ed157e3 ("Bluetooth: l2cap: Check encryption key size on incoming connection")
  103308e50db9 ("Bluetooth: btnxpuart: Add an error message if FW dump trigger fails")
  61a9c6e39c8d ("Bluetooth: btnxpuart: Revert baudrate change in nxp_shutdown")
  c174cd0945ad ("Bluetooth: increment TX timestamping tskey always for stream sockets")
  e92900c9803f ("Bluetooth: qca: fix NV variant for one of WCN3950 SoCs")
  324dddea3210 ("Bluetooth: btrtl: Prevent potential NULL dereference")
  eb73b5a91572 ("Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  60b82ca5d6bc ("Bluetooth: L2CAP: copy RX timestamp to new fragments")
  ac1f44f12090 ("Bluetooth: btintel_pcie: Add additional to checks to clear TX/RX paths")
  e0af21b30c82 ("Bluetooth: btmtksdio: Do close if SDIO card removed without close")
  04c96a7ace25 ("Bluetooth: btmtksdio: Check function enabled before doing close")
  a9d1f7313df5 ("Bluetooth: btusb: avoid NULL pointer dereference in skb_dequeue()")
  16b4f97defef ("Bluetooth: btintel_pcie: Avoid redundant buffer allocation")
  c3b6a7cfa98c ("Bluetooth: hci_conn: Fix not setting timeout for BIG Create Sync")
  58ddd115fe06 ("Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver")

These are commits

  3908feb1bd7f ("Bluetooth: L2CAP: copy RX timestamp to new fragments")
  1c7664957e4e ("Bluetooth: btintel_pcie: Add additional to checks to clear TX/RX paths")
  0b6d58bc6ea8 ("Bluetooth: btmtksdio: Do close if SDIO card removed without close")
  07e90048e356 ("Bluetooth: btmtksdio: Check function enabled before doing close")
  0317b033abcd ("Bluetooth: btusb: avoid NULL pointer dereference in skb_dequeue()")
  d1af1f02ef86 ("Bluetooth: btintel_pcie: Avoid redundant buffer allocation")
  024421cf3992 ("Bluetooth: hci_conn: Fix not setting timeout for BIG Create Sync")
  6d0417e4e1cf ("Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  259a6d602310 ("Bluetooth: btusb: use skb_pull to avoid unsafe access in QCA dump handling")
  18f5b2456b36 ("Bluetooth: L2CAP: Fix not checking l2cap_chan security level")

These are commits

  4bcb0c7dc254 ("Bluetooth: btusb: use skb_pull to avoid unsafe access in QCA dump handling")
  7af8479d9eb4 ("Bluetooth: L2CAP: Fix not checking l2cap_chan security level")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  a731614b3044 ("Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION")
  8df2c74d466c ("Bluetooth: hci_qca: move the SoC type check to the right place")
  4e221e2b5ee0 ("Bluetooth: btnxpuart: Fix missing devm_request_irq() return value check")
  2ab3abab237b ("Bluetooth: MGMT: reject malformed HCI_CMD_SYNC commands")

These are commits

  03dba9cea72f ("Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION")
  0fb410c914eb ("Bluetooth: hci_qca: move the SoC type check to the right place")
  edc14f2adc64 ("Bluetooth: btnxpuart: Fix missing devm_request_irq() return value check")
  03f1700b9b4d ("Bluetooth: MGMT: reject malformed HCI_CMD_SYNC commands")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  3812bd9eae38 ("Bluetooth: MGMT: Protect mgmt_pending list with its own lock")
  fa2c8bfe6794 ("Bluetooth: btintel_pcie: Reduce driver buffer posting to prevent race condition")
  e849b59c9db0 ("Bluetooth: btintel_pcie: Increase the tx and rx descriptor count")
  31b3d39c89f9 ("Bluetooth: btintel_pcie: Fix driver not posting maximum rx buffers")
  6c5d0010e8a4 ("Bluetooth: hci_core: fix list_for_each_entry_rcu usage")


These are commits

  6fe26f694c82 ("Bluetooth: MGMT: Protect mgmt_pending list with its own lock")
  bf2ffc4d14db ("Bluetooth: btintel_pcie: Reduce driver buffer posting to prevent race condition")
  2dd711102ce6 ("Bluetooth: btintel_pcie: Increase the tx and rx descriptor count")
  daabd2769850 ("Bluetooth: btintel_pcie: Fix driver not posting maximum rx buffers")
  308a3a8ce8ea ("Bluetooth: hci_core: fix list_for_each_entry_rcu usage")

In the net tree.

Also commit

  a214e21449f2 ("Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete")

is almost identical to commit

  e6ed54e86aae ("Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete")

in the net tree and, due to other changes in the bluetooth tree, is
causing a conflict.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  2814f02508c4 ("Bluetooth: eir: Fix possible crashes on eir_create_adv_data")
  31b3d39c89f9 ("Bluetooth: btintel_pcie: Fix driver not posting maximum rx buffers")
  3812bd9eae38 ("Bluetooth: MGMT: Protect mgmt_pending list with its own lock")
  618cabed8257 ("Bluetooth: ISO: Fix using BT_SK_PA_SYNC to detect BIS sockets")
  6c5d0010e8a4 ("Bluetooth: hci_core: fix list_for_each_entry_rcu usage")
  73700cd6bd6a ("Bluetooth: Fix NULL pointer deference on eir_get_service_data")
  dcd2b35c9b56 ("Bluetooth: ISO: Fix not using bc_sid as advertisement SID")
  e849b59c9db0 ("Bluetooth: btintel_pcie: Increase the tx and rx descriptor count")
  fa2c8bfe6794 ("Bluetooth: btintel_pcie: Reduce driver buffer posting to prevent race condition")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  4500d2e8da07 ("Bluetooth: hci_core: Fix use-after-free in vhci_flush()")
  6c31dab4ff1e ("driver: bluetooth: hci_qca:fix unable to load the BT driver")
  d5c2d5e0f1d3 ("Bluetooth: L2CAP: Fix L2CAP MTU negotiation")
  866fd57640ce ("Bluetooth: btintel_pcie: Fix potential race condition in firmware download")

These are commits

  1d6123102e9f ("Bluetooth: hci_core: Fix use-after-free in vhci_flush()")
  db0ff7e15923 ("driver: bluetooth: hci_qca:fix unable to load the BT driver")
  042bb9603c44 ("Bluetooth: L2CAP: Fix L2CAP MTU negotiation")
  89a33de31494 ("Bluetooth: btintel_pcie: Fix potential race condition in firmware download")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bluetooth tree

[Paolo Abeni]

Hi,

On 6/25/25 3:16 AM, Stephen Rothwell wrote:
> The following commits are also in the net tree as different commits
> (but the same patches):
> 
>   4500d2e8da07 ("Bluetooth: hci_core: Fix use-after-free in vhci_flush()")
>   6c31dab4ff1e ("driver: bluetooth: hci_qca:fix unable to load the BT driver")
>   d5c2d5e0f1d3 ("Bluetooth: L2CAP: Fix L2CAP MTU negotiation")
>   866fd57640ce ("Bluetooth: btintel_pcie: Fix potential race condition in firmware download")
> 
> These are commits
> 
>   1d6123102e9f ("Bluetooth: hci_core: Fix use-after-free in vhci_flush()")
>   db0ff7e15923 ("driver: bluetooth: hci_qca:fix unable to load the BT driver")
>   042bb9603c44 ("Bluetooth: L2CAP: Fix L2CAP MTU negotiation")
>   89a33de31494 ("Bluetooth: btintel_pcie: Fix potential race condition in firmware download")
> 
> in the net tree.

I think it's an artifact of the BT tree being rebased. I pulled from:

git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
tags/for-net-2025-06-23

It looks like the first set of commits is no more reachable in the bt
tree, so the 'net' ones should be the "correct" commits set. @Luiz:
could you please confirm?

Thanks,

Paolo

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  9b36e38d0fb5 ("Bluetooth: HCI: Set extended advertising data synchronously")
  8dcd9b294572 ("Bluetooth: MGMT: mesh_send: check instances prior disabling advertising")
  41d630621be1 ("Bluetooth: MGMT: set_mesh: update LE scan interval and window")
  1984453983fd ("Bluetooth: hci_sync: revert some mesh modifications")
  8466ce07cb6a ("Bluetooth: Prevent unintended pause by checking if advertising is active")

These are commits

  89fb8acc3885 ("Bluetooth: HCI: Set extended advertising data synchronously")
  f3cb5676e5c1 ("Bluetooth: MGMT: mesh_send: check instances prior disabling advertising")
  e5af67a870f7 ("Bluetooth: MGMT: set_mesh: update LE scan interval and window")
  46c0d947b64a ("Bluetooth: hci_sync: revert some mesh modifications")
  1f029b4e30a6 ("Bluetooth: Prevent unintended pause by checking if advertising is active")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  3ae443de7edf ("Bluetooth: hci_core: Fix not accounting for BIS/CIS/PA links separately")
  3f9a516852b6 ("Bluetooth: btnxpuart: Uses threaded IRQ for host wakeup handling")
  8477821d5f12 ("Bluetooth: hci_conn: do return error from hci_enhanced_setup_sync()")
  ad2f0c8792ef ("Bluetooth: hci_event: fix MTU for BN == 0 in CIS Established")
  3e383124ce63 ("Bluetooth: hci_sync: Prevent unintended PA sync when SID is 0xFF")
  c244fc08ac4e ("Bluetooth: hci_core: Fix using ll_privacy_capable for current settings")
  3ca23aaba210 ("Bluetooth: hci_core: Fix using {cis,bis}_capable for current settings")
  5ecd1fbdacce ("Bluetooth: btmtk: Fix wait_on_bit_timeout interruption during shutdown")
  9c533991fe15 ("Bluetooth: hci_conn: Fix not cleaning up Broadcaster/Broadcast Source")
  b69b1f91b84d ("Bluetooth: hci_conn: Fix running bis_cleanup for hci_conn->type PA_LINK")
  408410a0a0cb ("Bluetooth: ISO: Fix getname not returning broadcast fields")
  dc996aa11328 ("Bluetooth: hci_sync: Fix scan state after PA Sync has been established")
  fdbb50f1b26d ("Bluetooth: hci_sync: Avoid adding default advertising on startup")

These are commits

  9d4b01a0bf8d ("Bluetooth: hci_core: Fix not accounting for BIS/CIS/PA links separately")
  e489317d2fd9 ("Bluetooth: btnxpuart: Uses threaded IRQ for host wakeup handling")
  0eaf7c7e85da ("Bluetooth: hci_conn: do return error from hci_enhanced_setup_sync()")
  0b3725dbf61b ("Bluetooth: hci_event: fix MTU for BN == 0 in CIS Established")
  4d19cd228bbe ("Bluetooth: hci_sync: Prevent unintended PA sync when SID is 0xFF")
  3dcf7175f2c0 ("Bluetooth: hci_core: Fix using ll_privacy_capable for current settings")
  709788b154ca ("Bluetooth: hci_core: Fix using {cis,bis}_capable for current settings")
  099799fa9b76 ("Bluetooth: btmtk: Fix wait_on_bit_timeout interruption during shutdown")
  3ba486c5f3ce ("Bluetooth: hci_conn: Fix not cleaning up Broadcaster/Broadcast Source")
  d36349ea73d8 ("Bluetooth: hci_conn: Fix running bis_cleanup for hci_conn->type PA_LINK")
  aee29c18a38d ("Bluetooth: ISO: Fix getname not returning broadcast fields")
  ca88be1a2725 ("Bluetooth: hci_sync: Fix scan state after PA Sync has been established")
  de5d7d3f27dd ("Bluetooth: hci_sync: Avoid adding default advertising on startup")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  c49a788e88e4 ("Bluetooth: hci_sync: fix set_local_name race condition")
  0dbbf48d4b4b ("Bluetooth: hci_event: Disconnect device when BIG sync is lost")
  05be312ba55c ("Bluetooth: hci_event: Detect if HCI_EV_NUM_COMP_PKTS is unbalanced")
  e090ee03a6ed ("Bluetooth: hci_event: Mark connection as closed during suspend disconnect")
  f6305e06185a ("Bluetooth: hci_event: Treat UNKNOWN_CONN_ID on disconnect as success")

These are commits

  6bbd0d3f0c23 ("Bluetooth: hci_sync: fix set_local_name race condition")
  55b9551fcdf6 ("Bluetooth: hci_event: Disconnect device when BIG sync is lost")
  15bf2c6391ba ("Bluetooth: hci_event: Detect if HCI_EV_NUM_COMP_PKTS is unbalanced")
  b7fafbc499b5 ("Bluetooth: hci_event: Mark connection as closed during suspend disconnect")
  2f050a5392b7 ("Bluetooth: hci_event: Treat UNKNOWN_CONN_ID on disconnect as success")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the bluetooth tree

[Stephen Rothwell]

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

Hi all,

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

  02925b3b935e ("Bluetooth: Fix use-after-free in l2cap_sock_cleanup_listen()")
  c27de1739b83 ("Bluetooth: vhci: Prevent use-after-free by removing debugfs files early")

These are commits

  862c62810856 ("Bluetooth: Fix use-after-free in l2cap_sock_cleanup_listen()")
  28010791193a ("Bluetooth: vhci: Prevent use-after-free by removing debugfs files early")

in the net tree.

-- 
Cheers,
Stephen Rothwell

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