LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the bluetooth tree with the net tree
@ 2021-08-06 11:56 Mark Brown
  0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2021-08-06 11:56 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Luiz Augusto von Dentz, Tetsuo Handa, David S . Miller, netdev

Hi all,

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

  net/bluetooth/hci_sysfs.c
  net/bluetooth/hci_core.c
  include/net/bluetooth/hci_core.h

between commit:

  e04480920d1e ("Bluetooth: defer cleanup of resources in hci_unregister_dev()")

from the net tree and commit:

  58ce6d5b271a ("Bluetooth: defer cleanup of resources in hci_unregister_dev()")

from the bluetooth tree.

I fixed it up (see below) 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.

diff --cc include/net/bluetooth/hci_core.h
index db4312e44d47,a7d06d7da602..000000000000
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
diff --cc net/bluetooth/hci_core.c
index e1a545c8a69f,cb2e9e513907..000000000000
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
diff --cc net/bluetooth/hci_sysfs.c
index b69d88b88d2e,ebf282d1eb2b..000000000000
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-08-06 11:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-06 11:56 linux-next: manual merge of the bluetooth tree with the net tree Mark Brown

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