From: Jakub Kicinski <kuba@kernel.org>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: davem@davemloft.net, linux-bluetooth@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: pull request: bluetooth-next 2022-12-09
Date: Mon, 12 Dec 2022 12:36:24 -0800 [thread overview]
Message-ID: <20221212123624.6c797838@kernel.org> (raw)
In-Reply-To: <20221210013456.1085082-1-luiz.dentz@gmail.com>
On Fri, 9 Dec 2022 17:34:56 -0800 Luiz Augusto von Dentz wrote:
> bluetooth-next pull request for net-next:
>
> - Add a new VID/PID 0489/e0f2 for MT7922
> - Add Realtek RTL8852BE support ID 0x0cb8:0xc559
> - Add a new PID/VID 13d3/3549 for RTL8822CU
> - Add support for broadcom BCM43430A0 & BCM43430A1
> - Add CONFIG_BT_HCIBTUSB_POLL_SYNC
> - Add CONFIG_BT_LE_L2CAP_ECRED
> - Add support for CYW4373A0
> - Add support for RTL8723DS
> - Add more device IDs for WCN6855
> - Add Broadcom BCM4377 family PCIe Bluetooth
Hm, it's pulling in the commits we merged into net and which
are already present in net-next but with a different hash/id.
With a small overlap which git can't figure out:
diff --cc drivers/bluetooth/btusb.c
index f05018988a17,2ad4efdd9e40..24a8ed3f0458
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -2052,17 -2206,17 +2206,22 @@@ static int btusb_setup_csr(struct hci_d
bt_dev_err(hdev, "CSR: Local version length mismatch");
kfree_skb(skb);
return -EIO;
}
- rp = (struct hci_rp_read_local_version *)skb->data;
+ bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x",
+ rp->hci_ver, le16_to_cpu(rp->hci_rev));
+
+ bt_dev_info(hdev, "LMP ver=%u subver=%04x; manufacturer=%u",
+ rp->lmp_ver, le16_to_cpu(rp->lmp_subver),
+ le16_to_cpu(rp->manufacturer));
+ bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x; LMP ver=%u subver=%04x; manufacturer=%u",
+ le16_to_cpu(rp->hci_ver), le16_to_cpu(rp->hci_rev),
+ le16_to_cpu(rp->lmp_ver), le16_to_cpu(rp->lmp_subver),
+ le16_to_cpu(rp->manufacturer));
+
Could you rebase on top of net-next and resend so that the commits
which are already applied disappear?
next prev parent reply other threads:[~2022-12-12 20:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-10 1:34 pull request: bluetooth-next 2022-12-09 Luiz Augusto von Dentz
2022-12-12 20:36 ` Jakub Kicinski [this message]
2022-12-12 21:56 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221212123624.6c797838@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.