linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: duplicate patches in the bluetooth tree
@ 2024-04-11 21:34 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2024-04-11 21:34 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: linux-next: duplicate patches in the bluetooth tree
  2024-04-25 21:09 Stephen Rothwell
@ 2024-05-06  1:33 ` Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2024-05-06  1:33 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2024-04-25 21:09 Stephen Rothwell
  2024-05-06  1:33 ` Stephen Rothwell
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2024-04-25 21:09 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2024-04-01 23:37 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2024-04-01 23:37 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2024-02-29 22:25 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2024-02-29 22:25 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: linux-next: duplicate patches in the bluetooth tree
  2023-12-21  1:24 Stephen Rothwell
@ 2023-12-21 21:41 ` Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-12-21 21:41 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-12-21  1:24 Stephen Rothwell
  2023-12-21 21:41 ` Stephen Rothwell
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2023-12-21  1:24 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: linux-next: duplicate patches in the bluetooth tree
  2023-10-18  3:14 Stephen Rothwell
@ 2023-10-19 21:23 ` Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-10-19 21:23 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-10-18  3:14 Stephen Rothwell
  2023-10-19 21:23 ` Stephen Rothwell
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2023-10-18  3:14 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-10-05 22:02 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-10-05 22:02 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-10-03  1:19 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-10-03  1:19 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg, David Miller, Jakub Kicinski,
	Paolo Abeni
  Cc: Networking, Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-07-23 22:44 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-07-23 22:44 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-07-06  2:35 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-07-06  2:35 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Jakub Kicinski, Luiz Augusto von Dentz,
	Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-06-30  0:21 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-06-30  0:21 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-06-08  0:47 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-06-08  0:47 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg, David Miller, Jakub Kicinski
  Cc: Networking, Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-05-29 21:59 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-05-29 21:59 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: linux-next: duplicate patches in the bluetooth tree
  2023-03-24  1:21 Stephen Rothwell
@ 2023-03-26 20:47 ` Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-03-26 20:47 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, David Miller,
	Networking, Jakub Kicinski

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-03-24  1:21 Stephen Rothwell
  2023-03-26 20:47 ` Stephen Rothwell
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2023-03-24  1:21 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, David Miller,
	Networking, Jakub Kicinski

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: duplicate patches in the bluetooth tree
@ 2023-01-19  0:48 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-01-19  0:48 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg, David Miller
  Cc: Luiz Augusto von Dentz, Networking, Linux Kernel Mailing List,
	Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2024-05-06  1:33 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-11 21:34 linux-next: duplicate patches in the bluetooth tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-04-25 21:09 Stephen Rothwell
2024-05-06  1:33 ` 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

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