From: Luiz Augusto von Dentz <luiz.dentz@xxxxxxxxx> Date: Thu, 19 Aug 2021 15:23:07 -0700 > The following changes since commit 4431531c482a2c05126caaa9fcc5053a4a5c495b: > > nfp: fix return statement in nfp_net_parse_meta() (2021-07-22 05:46:03 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2021-08-19 > There was a major merge conflict with the deferred hci cleanup fix that came in via 'net'. Please double check my conflict resolution. Thanks.
