Bluetooth: Add AIC8800D80 SDIO firmware loader and UART HCI
Subsystems (2)
PATCH v5 1/3 dt-bindings: vendor-prefixes: Add AIC Semiconductor
In reply to Yanli YangAdd the vendor prefix for AIC Semiconductor (Shanghai) Co., Ltd., used by the AIC8800D80 Bluetooth bindings.
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -76,6 +76,8 @@ patternProperties: description: Aeroflex Gaisler AB "^aesop,.*": description: AESOP Embedded Forum + "^aic,.*": + description: AIC Semiconductor (Shanghai) Co., Ltd. "^airoha,.*": description: Airoha "^al,.*":
Signature · 1 line
2.34.1
v5 cover Bluetooth: Add AIC8800D80 SDIO firmware loader and UART HCI
Hi,
This series adds Bluetooth support for the AIC8800D80. SDIO function 1 loads firmware; a serdev UART carries H4 HCI traffic at 1500000 baud with hardware flow control. The three patches add the AIC vendor prefix, the Device Tree binding, and the driver with build and maintainer integration.
Changes since v4:
- Use kzalloc_obj(*boot) for the boot state allocation, as requested by checkpatch.
- Mark the SDIO system sleep callbacks __maybe_unused for builds without CONFIG_PM_SLEEP.
Thanks for the report. kzalloc_obj() is defined in include/linux/slab.h in the target bluetooth-next tree, and btaic_core.c includes that header. Therefore, kzalloc_obj(*boot) will not cause an undefined-macro build failure. It uses GFP_KERNEL by default and also follows checkpatch's recommendation for this allocation.
Review of the other reported findings:
- The TX/RX IPC layouts are intentionally asymmetric, as in the AIC BSP. TX has a 4-byte dummy word before the message ID; RX has a 4-byte pattern after param_len. The BSP RX path casts the buffer at offset 4 to struct ipc_e2a_msg. Accordingly, the RX response ID is at frame offset 4 and param_len at offset 10. The reported firmware-loading layout mismatch is a false positive.
- In this target tree h4_recv_buf() takes struct hci_uart * and forwards hu->hdev to h4_recv_skb(). The driver sets uart->hu.hdev before hci_register_dev(), so passing &uart->hu is type-correct. Commit b489556a856d ("Bluetooth: fix corruption in h4_recv_buf() after cleanup") changed this API; the reported type mismatch refers to the older API.
- If skb_cow_head() fails, aic_bt_send_frame() returns the error without consuming the skb. hci_send_frame() frees the skb when ->send() returns an error; freeing it in the driver would cause a double free. The reported skb leak is a false positive.
- sdio_bus_probe() releases the MMC host before the driver probe, and aic_bt_sdio_hw_init() releases it before firmware loading. No request_firmware() call holds the MMC host or AIC command locks. The command path also releases the host before waiting for IRQ completion. Synchronous firmware loading may delay probe, but the reported SDIO deadlock does not apply.
The bluez.test.bot mgmt-tester and mesh-tester failures also reproduce with unrelated patches and appear to be CI test failures. The GitLint failure is caused by the automatically generated "create mode" line for the DT binding path.
Validation: The vendor has confirmed SDIO firmware loading. UART HCI communication, controller initialization, scanning, pairing, connections, data transfer, suspend/resume, and Wi-Fi/Bluetooth coexistence have not been validated on hardware. The external firmware files are not included in this series.
Thanks,
Yanli
Yanli Yang (3):
dt-bindings: vendor-prefixes: Add AIC Semiconductor
dt-bindings: net: bluetooth: Add AIC8800D80
Bluetooth: btaic: Add AIC8800D80 SDIO loader and UART transport
.../net/bluetooth/aic,aic8800d80-bt.yaml | 84 ++ .../devicetree/bindings/vendor-prefixes.yaml | 2 + MAINTAINERS | 11 + drivers/bluetooth/Kconfig | 16 + drivers/bluetooth/Makefile | 3 + drivers/bluetooth/btaic.h | 26 + drivers/bluetooth/btaic_core.c | 180 ++++ drivers/bluetooth/btaic_sdio.c | 901 ++++++++++++++++++ drivers/bluetooth/btaic_uart.c | 337 +++++++ 9 files changed, 1560 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml create mode 100644 drivers/bluetooth/btaic.h create mode 100644 drivers/bluetooth/btaic_core.c create mode 100644 drivers/bluetooth/btaic_sdio.c create mode 100644 drivers/bluetooth/btaic_uart.c
Signature · 1 line
2.34.1
PATCH v5 3/3 Bluetooth: btaic: Add AIC8800D80 SDIO loader and UART transport
Add a driver for the AIC8800D80 combination chip, using SDIO function 1 for Bluetooth firmware loading and a serdev UART for H4 HCI traffic.
Load the ADID image, patch image and patch table through request_firmware(), validate the patch-table layout, and transfer firmware using the vendor SDIO command protocol. Recognize the U02 and U03 chip revisions.
Coordinate the SDIO firmware provider and UART consumer through a reference-counted boot state and a device link. Wait for firmware readiness before opening the UART, and use hardware flow control at 1500000 baud.
Free a partial RX frame when opening the serdev or setting the baudrate fails, so stale H4 state cannot survive a failed HCI open.
Add CONFIG_BT_AIC and build integration, and extend the MAINTAINERS entry with the driver file pattern.
The vendor has confirmed SDIO firmware loading. UART HCI operation and other Bluetooth functionality have not yet been validated on hardware.
--- MAINTAINERS | 1 + drivers/bluetooth/Kconfig | 16 + drivers/bluetooth/Makefile | 3 + drivers/bluetooth/btaic.h | 26 + drivers/bluetooth/btaic_core.c | 180 +++++++ drivers/bluetooth/btaic_sdio.c | 901 +++++++++++++++++++++++++++++++++ drivers/bluetooth/btaic_uart.c | 337 ++++++++++++ 7 files changed, 1464 insertions(+) create mode 100644 drivers/bluetooth/btaic.h create mode 100644 drivers/bluetooth/btaic_core.c create mode 100644 drivers/bluetooth/btaic_sdio.c create mode 100644 drivers/bluetooth/btaic_uart.c
MAINTAINERS +1 -0
@@ -738,6 +738,7 @@ M: Yanli Yang <[email protected]> L: [email protected] S: Maintained F: Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml +F: drivers/bluetooth/btaic* AIC7XXX / AIC79XX SCSI DRIVER M: Hannes Reinecke <[email protected]>
drivers/bluetooth/Kconfig +16 -0
@@ -487,4 +487,20 @@ config BT_INTEL_PCIE Say Y here to compiler support for Intel Bluetooth PCIe device into the kernel or say M to compile it as module (btintel_pcie) + +config BT_AIC + tristate "AIC8800D80 Bluetooth support" + depends on MMC + depends on SERIAL_DEV_BUS + depends on BT_HCIUART + select BT_HCIUART_H4 + select FW_LOADER + help + Bluetooth support for the AIC8800D80 combination chip, using an + SDIO function for firmware loading and a UART interface for the + HCI transport. + + Say Y here to compile support into the kernel or M to build it as + a module named btaic. + endmenu
drivers/bluetooth/Makefile +3 -0
@@ -20,6 +20,7 @@ obj-$(CONFIG_BT_MRVL) += btmrvl.o obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o obj-$(CONFIG_BT_MTKSDIO) += btmtksdio.o obj-$(CONFIG_BT_MTKUART) += btmtkuart.o +obj-$(CONFIG_BT_AIC) += btaic.o obj-$(CONFIG_BT_QCOMSMD) += btqcomsmd.o obj-$(CONFIG_BT_BCM) += btbcm.o obj-$(CONFIG_BT_RTL) += btrtl.o
@@ -55,3 +56,5 @@ btusb-y := btusb_main.o btusb-$(CONFIG_BT_HCIBTUSB_QCOM) += btusb_qcom.o CONTEXT_ANALYSIS := y + +btaic-y := btaic_core.o btaic_sdio.o btaic_uart.o
drivers/bluetooth/btaic.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __BTAIC_H +#define __BTAIC_H + +#include <linux/types.h> + +struct device ; +struct fwnode_handle ; + +struct aic_bt_boot ; + +struct aic_bt_boot *aic_bt_boot_register (struct device *dev); +void aic_bt_boot_ready (struct aic_bt_boot *boot,int status); +void aic_bt_boot_unregister (struct aic_bt_boot *boot); + +struct aic_bt_boot *aic_bt_boot_get (const struct fwnode_handle *fwnode); +void aic_bt_boot_put (struct aic_bt_boot *boot); +int aic_bt_boot_wait (struct aic_bt_boot *boot,unsigned long timeout); +struct device *aic_bt_boot_device (struct aic_bt_boot *boot); + +int aic_bt_sdio_register (void ); +void aic_bt_sdio_unregister (void ); +int aic_bt_uart_register (void ); +void aic_bt_uart_unregister (void ); + +#endif
drivers/bluetooth/btaic_core.c new file +180 -0
180 lines not on this page · raw message
drivers/bluetooth/btaic_sdio.c new file +901 -0
901 lines not on this page · raw message
drivers/bluetooth/btaic_uart.c new file +337 -0
337 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 2/3 dt-bindings: net: bluetooth: Add AIC8800D80
In reply to Yanli YangDescribe the AIC8800D80 Bluetooth SDIO firmware-loading function and UART HCI interface. Link the UART node to its SDIO firmware provider with the aic,firmware-sdio phandle.
The UART interface uses H4 at 1500000 baud with hardware flow control. Include an example showing both nodes and their association. Add the Bluetooth binding to MAINTAINERS.
--- .../net/bluetooth/aic,aic8800d80-bt.yaml | 84 +++++++++++++++++++ MAINTAINERS | 10 +++ 2 files changed, 94 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml
Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml new file +84 -0
@@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/bluetooth/aic,aic8800d80-bt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AIC AIC8800D80 Bluetooth + +maintainers: + - Zhirun Liu <[email protected]> + - Dijia Xu <[email protected]> + - Chunqiu Liu <[email protected]> + - Liheng Wei <[email protected]> + - Yanli Yang <[email protected]> + +description: + The AIC8800D80 is a Wi-Fi and Bluetooth combination chip. The Bluetooth + firmware is loaded through SDIO function 1, while Bluetooth HCI traffic uses + the H4 protocol over a UART interface with hardware flow control. + +properties: + compatible: + enum: + - aic,aic8800d80-bt + - aic,aic8800d80-bt-sdio + + reg: + maxItems: 1 + + max-speed: false + + aic,firmware-sdio: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the SDIO function used to load the Bluetooth firmware. + +required: + - compatible + +allOf: + - $ref: bluetooth-controller.yaml# + - if: + properties: + compatible: + const: aic,aic8800d80-bt-sdio + then: + properties: + reg: + items: + - items: + - const: 1 + aic,firmware-sdio: false + required: + - reg + else: + properties: + reg: false + required: + - aic,firmware-sdio + allOf: + - $ref: /schemas/serial/serial-peripheral-props.yaml# + +unevaluatedProperties: false + +examples: + - | + mmc { + #address-cells = <1>; + #size-cells = <0>; + + bt_sdio: bluetooth@1 { + compatible = "aic,aic8800d80-bt-sdio"; + reg = <1>; + }; + }; + + serial { + uart-has-rtscts; + + bluetooth { + compatible = "aic,aic8800d80-bt"; + aic,firmware-sdio = <&bt_sdio>; + }; + };
MAINTAINERS +10 -0
@@ -729,6 +729,16 @@ S: Maintained F: drivers/scsi/aha152x* F: drivers/scsi/pcmcia/aha152x* +AIC BLUETOOTH DRIVER +M: Zhirun Liu <[email protected]> +M: Dijia Xu <[email protected]> +M: Chunqiu Liu <[email protected]> +M: Liheng Wei <[email protected]> +M: Yanli Yang <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml + AIC7XXX / AIC79XX SCSI DRIVER M: Hannes Reinecke <[email protected]> L: [email protected]
Signature · 1 line
2.34.1
Re: [PATCH bluetooth-next v5 1/3] dt-bindings: vendor-prefixes: Add AIC Semiconductor
In reply to Yanli YangQuoted 8 lines · Yanli Yang
Add the vendor prefix for AIC Semiconductor (Shanghai) Co., Ltd., used by the AIC8800D80 Bluetooth bindings.
Signed-off-by Zhirun Liu <[email protected]>Signed-off-by Dijia Xu <[email protected]>Signed-off-by Chunqiu Liu <[email protected]>Signed-off-by Liheng Wei <[email protected]>Signed-off-by Yanli Yang <[email protected]>
5 people worked on this one liner?
Best regards,
Krzysztof
[email protected]
AI reviewRe: [PATCH bluetooth-next v5 3/3] Bluetooth: btaic: Add AIC8800D80 SDIO loader and UART transport
In reply to Yanli YangThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [High] bluetooth: btaic: forcible override of SDIO CCCR IEN corrupts bus state - [Medium] bluetooth…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [High] bluetooth: btaic: forcible override of SDIO CCCR IEN corrupts bus state
- [Medium] bluetooth: btaic: permanent TX queue wedge on UART transmission error --
commit 0b3f4967899ed87ce6d0daef5c0ff2b9f67d8faf
Author: Yanli Yang <[email protected]>
Bluetooth: btaic: Add AIC8800D80 SDIO loader and UART transport
This commit adds a driver for the AIC8800D80 combination chip. It uses SDIO function 1 for Bluetooth firmware loading and a serdev UART for H4 HCI traffic. Firmware loading and patching are synchronized with UART initialization via a reference-counted boot state.
Quoted 4 lines
drivers/bluetooth/btaic_sdio.c new file +0
-0
[ ... ]
Quoted 6 lines
drivers/bluetooth/btaic_sdio.c new file +6
-0+static int aic_bt_sdio_hw_init (struct aic_bt_sdio *btdev) +{ +struct sdio_func *func = btdev->func; +struct mmc_host *host = func->card->host; +u8 io_control; +int err;
[ ... ]
drivers/bluetooth/btaic_sdio.c line 736
Quoted 6 lines
drivers/bluetooth/btaic_sdio.c new file +6
-0+ err =sdio_claim_irq (func, aic_bt_sdio_irq); +if (err) + goto disable_func; + btdev->irq_claimed = true; + +sdio_f0_writeb (func,0x07 ,0x04 , &err);
[Severity: High]
Does this hardcoded write to the CCCR IEN register (0x04) bypass the MMC core's interrupt tracking?
Since sdio_claim_irq() was already called to properly enable the master and Function 1 interrupts, writing 0x07 forcibly enables the Function 2 (WiFi) interrupt outside of the MMC core's knowledge. Could this lead to unhandled interrupt storms or disrupt the WiFi function if its driver is not yet ready?
Quoted 9 lines
drivers/bluetooth/btaic_sdio.c new file +9
-0+if (err) + goto release_irq; + +sdio_writeb (func,0x07 ,AIC_SDIO_INTR_ENABLE , &err); +if (err) + goto release_irq; + +sdio_release_host (func); +return 0 ;
[ ... ]
Quoted 4 lines
drivers/bluetooth/btaic_uart.c new file +0
-0
[ ... ]
Quoted 12 lines
drivers/bluetooth/btaic_uart.c new file +12
-0+static void aic_bt_tx_work (struct work_struct *work) +{ + struct aic_bt_uart *uart = container_of(work, struct aic_bt_uart, + tx_work); + +for (;;) { +struct sk_buff *skb; + +clear_bit (AIC_BT_TX_WAKEUP , &uart->tx_state); + +while ((skb =skb_dequeue (&uart->txq))) { +int len;
drivers/bluetooth/btaic_uart.c line 74
Quoted 10 lines
drivers/bluetooth/btaic_uart.c new file +10
-0+ + len =serdev_device_write_buf (uart->serdev, skb->data, + skb->len); +if (len <=0 ) { +skb_queue_head (&uart->txq, skb); +if (len <0 ) +bt_dev_err (uart->hdev, +"UART transmit failed (%d)" , len); +break ; + }
[Severity: Medium]
Will this create a permanent wedge in the TX queue on a transmission error?
If serdev_device_write_buf() returns a negative error code (such as -EIO or -ENODEV) due to local hardware or bus errors, the driver treats it identically to a full buffer by pushing the exact same skb back to the head of uart->txq.
On the next TX wakeup, it appears it will dequeue this same packet, fail again, and requeue it indefinitely, which would effectively block all subsequent outbound Bluetooth traffic rather than gracefully dropping the failed packet.
Quoted 7 lines
drivers/bluetooth/btaic_uart.c new file +7
-0+ + uart->hdev->stat.byte_tx += len; +skb_pull (skb, len); +if (skb->len) { +skb_queue_head (&uart->txq, skb); +break ; + }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Re: [PATCH bluetooth-next v5 2/3] dt-bindings: net: bluetooth: Add AIC8800D80
In reply to Yanli YangQuoted 8 lines · Yanli Yang
Describe the AIC8800D80 Bluetooth SDIO firmware-loading function and UART HCI interface. Link the UART node to its SDIO firmware provider with the aic,firmware-sdio phandle.
The UART interface uses H4 at 1500000 baud with hardware flow control. Include an example showing both nodes and their association. Add the Bluetooth binding to
MAINTAINERS.
Quoted 6 lines
Signed-off-by Zhirun Liu <[email protected]>Signed-off-by Dijia Xu <[email protected]>Signed-off-by Chunqiu Liu <[email protected]>Signed-off-by Liheng Wei <[email protected]>Signed-off-by Yanli Yang <[email protected]>---
So that's v5, thus where is the changelog?
Cover letter says nothing about v1-v3, only v4. And in that v4 nothing about this and 1/3 patches.
Quoted 26 lines
.../net/bluetooth/aic,aic8800d80-bt.yaml | 84 +++++++++++++++++++ MAINTAINERS | 10 +++ 2 files changed, 94 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yamlDocumentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml new file +15
-0@@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/bluetooth/aic,aic8800d80-bt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AIC AIC8800D80 Bluetooth + +maintainers: + - Zhirun Liu <[email protected]> + - Dijia Xu <[email protected]> + - Chunqiu Liu <[email protected]> + - Liheng Wei <[email protected]> + - Yanli Yang <[email protected]> +
Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml line 25
Quoted 10 lines
Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml new file +10
-0+description: + The AIC8800D80 is a Wi-Fi and Bluetooth combination chip. The Bluetooth + firmware is loaded through SDIO function 1, while Bluetooth HCI traffic uses + the H4 protocol over a UART interface with hardware flow control. + +properties: + compatible: + enum: + - aic,aic8800d80-bt + - aic,aic8800d80-bt-sdio
So same feedback as last time. Same device?
Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml line 35
Quoted 10 lines
Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml new file +10
-0+ + reg: + maxItems: 1 + + max-speed: false + + aic,firmware-sdio: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the SDIO function used to load the Bluetooth firmware.
What is a SDIO function in DT? Phandles can only point to device nodes.
Quoted 54 lines
Documentation/devicetree/bindings/net/bluetooth/aic,aic8800d80-bt.yaml new file +49
-0+ +required: + - compatible + +allOf: + - $ref: bluetooth-controller.yaml# + - if: + properties: + compatible: + const: aic,aic8800d80-bt-sdio + then: + properties: + reg: + items: + - items: + - const: 1 + aic,firmware-sdio: false + required: + - reg + else: + properties: + reg: false + required: + - aic,firmware-sdio + allOf: + - $ref: /schemas/serial/serial-peripheral-props.yaml# + +unevaluatedProperties: false + +examples: + - | + mmc { + #address-cells = <1>; + #size-cells = <0>; + + bt_sdio: bluetooth@1 { + compatible = "aic,aic8800d80-bt-sdio"; + reg = <1>; + }; + }; + + serial { + uart-has-rtscts; + + bluetooth { + compatible = "aic,aic8800d80-bt"; + aic,firmware-sdio = <&bt_sdio>; + }; + };MAINTAINERS +0
-0
MAINTAINERS S: Maintained · line 737
Quoted 9 lines
MAINTAINERS +6
-0@@ -729,6 +729,16 @@ S: Maintained F: drivers/scsi/aha152x* F: drivers/scsi/pcmcia/aha152x* "managers" +AIC BLUETOOTH DRIVER +M: Zhirun Liu <[email protected]> +M: Dijia Xu <[email protected]> +M: Chunqiu Liu <[email protected]> +M: Liheng Wei <[email protected]> +M: Yanli Yang <[email protected]>
So all these 5 people are going to provide reviews?
Please confirm this explicitly, so we don't get entries for, for example, managers which like to be notified.
Best regards,
Krzysztof
Re: [PATCH bluetooth-next v5 1/3] dt-bindings: vendor-prefixes: Add AIC Semiconductor
In reply to Krzysztof KozlowskiQuoted 15 lines
From: "Krzysztof Kozlowski"<[email protected]>
Date: Thu, Sep 24, 2026, 15:51
Subject: Re: [PATCH bluetooth-next v5 1/3] dt-bindings: vendor-prefixes: Add AIC Semiconductor
To: "Yanli Yang"<[email protected]>, <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>Quoted 8 lines · Yanli Yang
Add the vendor prefix for AIC Semiconductor (Shanghai) Co., Ltd., used by the AIC8800D80 Bluetooth bindings.
Signed-off-by Zhirun Liu <[email protected]>Signed-off-by Dijia Xu <[email protected]>Signed-off-by Chunqiu Liu <[email protected]>Signed-off-by Liheng Wei <[email protected]>Signed-off-by Yanli Yang <[email protected]>
Quoted 6 lines
5 people worked on this one liner?
Best regards,
Krzysztof
Hi, Krzysztof
Thanks for pointing this out.
You are right, this is only a one-line fix. I will remove the extra Signed-off-by lines from this commit and keep only the author and relevant contributors for this specific change in next version.
This is an automated email and please do not reply to this email.
Dear Submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.
----- Output -----
error: patch failed: MAINTAINERS:738
error: MAINTAINERS: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Please resolve the issue and submit the patches again.
---
Regards,
Linux Bluetooth