netdev - linux-next: manual merge of the bluetooth tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240702114314.6bea5fe4@canb.auug.org.au>
Date: Tue, 2 Jul 2024 11:43:14 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Marcel Holtmann <marcel@...tmann.org>, Johan Hedberg
 <johan.hedberg@...il.com>, David Miller <davem@...emloft.net>, Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Luiz Augusto von Dentz
 <luiz.von.dentz@...el.com>
Subject: linux-next: manual merge of the bluetooth tree with the net tree

Hi all,

Today's linux-next merge of the bluetooth tree got a conflict in:

  net/bluetooth/hci_core.c

between commit:

  f1a8f402f13f ("Bluetooth: L2CAP: Fix deadlock")

from the net tree and commits:

  6851d11d389c ("Bluetooth: Fix double free in hci_req_sync_complete")
  7b256038ca7c ("Bluetooth: Fix usage of __hci_cmd_sync_status")

from the bluetooth tree.

I fixed it up (I basically used the latter where they conflicted) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped