* QCA Bluetooth WCN685x firmware pull request
@ 2021-12-16 8:56 Zijun Hu
2021-12-16 14:46 ` Josh Boyer
0 siblings, 1 reply; 6+ messages in thread
From: Zijun Hu @ 2021-12-16 8:56 UTC (permalink / raw)
To: linux-firmware; +Cc: Rocky Liao, tjiang, Zijun Hu, zijuhu
Hi linux-firmware maintainers,
Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
The following changes since commit
commit b0e898fbaf377c99a36aac6fdeb7250003648ca4
linux-firmware: Update firmware file for Intel Bluetooth 9462 (Tue Nov 23 10:29:13 2021 +0530)
are available in the Git repository at:
https://github.com/zijun-hu/qca-btfw.git
for you to fetch changes up to 2d86903a10c2b06fdc84141167030931ac973a3f:
----------------------------------------------------------------
Zijun Hu (1):
QCA: Update Bluetooth WCN685x firmware to 2.1.0-00297 (Thu Dec 9 16:09:53 2021 +0800)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: QCA Bluetooth WCN685x firmware pull request
2021-12-16 8:56 QCA Bluetooth WCN685x firmware pull request Zijun Hu
@ 2021-12-16 14:46 ` Josh Boyer
2021-12-17 4:47 ` Zijun Hu
0 siblings, 1 reply; 6+ messages in thread
From: Josh Boyer @ 2021-12-16 14:46 UTC (permalink / raw)
To: Zijun Hu; +Cc: Linux Firmware, Rocky Liao, tjiang, Zijun Hu
This conflicts with the update I just pulled from tjiang.
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 7 (delta 4), reused 7 (delta 4), pack-reused 0
Unpacking objects: 100% (7/7), 81.20 KiB | 1.14 MiB/s, done.
From https://github.com/zijun-hu/qca-btfw
* branch HEAD -> FETCH_HEAD
warning: Cannot merge binary files: qca/nvm_usb_00130201.bin (HEAD vs.
2d86903a10c2b06fdc84141167030931ac973a3f)
CONFLICT (add/add): Merge conflict in qca/nvm_usb_00130201.bin
Auto-merging qca/nvm_usb_00130201.bin
Auto-merging WHENCE
Automatic merge failed; fix conflicts and then commit the result.
Can you discuss and see if it's needed?
josh
On Thu, Dec 16, 2021 at 3:56 AM Zijun Hu <zijuhu@codeaurora.org> wrote:
>
> Hi linux-firmware maintainers,
>
> Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
>
> The following changes since commit
> commit b0e898fbaf377c99a36aac6fdeb7250003648ca4
> linux-firmware: Update firmware file for Intel Bluetooth 9462 (Tue Nov 23 10:29:13 2021 +0530)
>
> are available in the Git repository at:
>
> https://github.com/zijun-hu/qca-btfw.git
>
> for you to fetch changes up to 2d86903a10c2b06fdc84141167030931ac973a3f:
> ----------------------------------------------------------------
> Zijun Hu (1):
> QCA: Update Bluetooth WCN685x firmware to 2.1.0-00297 (Thu Dec 9 16:09:53 2021 +0800)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: QCA Bluetooth WCN685x firmware pull request
2021-12-16 14:46 ` Josh Boyer
@ 2021-12-17 4:47 ` Zijun Hu
2021-12-21 2:56 ` Zijun Hu
0 siblings, 1 reply; 6+ messages in thread
From: Zijun Hu @ 2021-12-17 4:47 UTC (permalink / raw)
To: Josh Boyer; +Cc: Linux Firmware, Rocky Liao, tjiang, Zijun Hu
Hi Josh,
i have solved the conflict and update pull request as following.
could you pull again?
Hi linux-firmware maintainers,
Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
The following changes since commit
commit f682ecb015df087613f91872712eb6c0f6c998a8
Merge https://github.com/pkshih/linux-firmware into main (Thu Dec 16 09:42:51 2021 -0500)
are available in the Git repository at:
https://github.com/zijun-hu/qca-btfw.git
for you to fetch changes up to 1500362ad671e202a0ccec37064528395daf5936:
----------------------------------------------------------------
Zijun Hu (1):
QCA: Update Bluetooth WCN685x firmware to 2.1.0-00298 (Fri Dec 17 12:28:26 2021 +0800)
On 12/16/2021 10:46 PM, Josh Boyer wrote:
> This conflicts with the update I just pulled from tjiang.
>
> remote: Enumerating objects: 7, done.
> remote: Counting objects: 100% (7/7), done.
> remote: Compressing objects: 100% (3/3), done.
> remote: Total 7 (delta 4), reused 7 (delta 4), pack-reused 0
> Unpacking objects: 100% (7/7), 81.20 KiB | 1.14 MiB/s, done.
> From https://github.com/zijun-hu/qca-btfw
> * branch HEAD -> FETCH_HEAD
> warning: Cannot merge binary files: qca/nvm_usb_00130201.bin (HEAD vs.
> 2d86903a10c2b06fdc84141167030931ac973a3f)
> CONFLICT (add/add): Merge conflict in qca/nvm_usb_00130201.bin
> Auto-merging qca/nvm_usb_00130201.bin
> Auto-merging WHENCE
> Automatic merge failed; fix conflicts and then commit the result.
>
> Can you discuss and see if it's needed?
>
> josh
>
> On Thu, Dec 16, 2021 at 3:56 AM Zijun Hu <zijuhu@codeaurora.org> wrote:
>>
>> Hi linux-firmware maintainers,
>>
>> Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
>>
>> The following changes since commit
>> commit b0e898fbaf377c99a36aac6fdeb7250003648ca4
>> linux-firmware: Update firmware file for Intel Bluetooth 9462 (Tue Nov 23 10:29:13 2021 +0530)
>>
>> are available in the Git repository at:
>>
>> https://github.com/zijun-hu/qca-btfw.git
>>
>> for you to fetch changes up to 2d86903a10c2b06fdc84141167030931ac973a3f:
>> ----------------------------------------------------------------
>> Zijun Hu (1):
>> QCA: Update Bluetooth WCN685x firmware to 2.1.0-00297 (Thu Dec 9 16:09:53 2021 +0800)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: QCA Bluetooth WCN685x firmware pull request
2021-12-17 4:47 ` Zijun Hu
@ 2021-12-21 2:56 ` Zijun Hu
2021-12-29 13:30 ` Josh Boyer
0 siblings, 1 reply; 6+ messages in thread
From: Zijun Hu @ 2021-12-21 2:56 UTC (permalink / raw)
To: Josh Boyer, Linux Firmware; +Cc: Rocky Liao, tjiang, Zijun Hu
Hi linux-firmware maintainers
could you pull this updated request?
On 12/17/2021 12:47 PM, Zijun Hu wrote:
> Hi Josh,
> i have solved the conflict and update pull request as following.
> could you pull again?
>
> Hi linux-firmware maintainers,
>
> Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
>
> The following changes since commit
> commit f682ecb015df087613f91872712eb6c0f6c998a8
> Merge https://github.com/pkshih/linux-firmware into main (Thu Dec 16 09:42:51 2021 -0500)
>
> are available in the Git repository at:
>
> https://github.com/zijun-hu/qca-btfw.git
>
> for you to fetch changes up to 1500362ad671e202a0ccec37064528395daf5936:
> ----------------------------------------------------------------
> Zijun Hu (1):
> QCA: Update Bluetooth WCN685x firmware to 2.1.0-00298 (Fri Dec 17 12:28:26 2021 +0800)
>
>
> On 12/16/2021 10:46 PM, Josh Boyer wrote:
>> This conflicts with the update I just pulled from tjiang.
>>
>> remote: Enumerating objects: 7, done.
>> remote: Counting objects: 100% (7/7), done.
>> remote: Compressing objects: 100% (3/3), done.
>> remote: Total 7 (delta 4), reused 7 (delta 4), pack-reused 0
>> Unpacking objects: 100% (7/7), 81.20 KiB | 1.14 MiB/s, done.
>> From https://github.com/zijun-hu/qca-btfw
>> * branch HEAD -> FETCH_HEAD
>> warning: Cannot merge binary files: qca/nvm_usb_00130201.bin (HEAD vs.
>> 2d86903a10c2b06fdc84141167030931ac973a3f)
>> CONFLICT (add/add): Merge conflict in qca/nvm_usb_00130201.bin
>> Auto-merging qca/nvm_usb_00130201.bin
>> Auto-merging WHENCE
>> Automatic merge failed; fix conflicts and then commit the result.
>>
>> Can you discuss and see if it's needed?
>>
>> josh
>>
>> On Thu, Dec 16, 2021 at 3:56 AM Zijun Hu <zijuhu@codeaurora.org> wrote:
>>>
>>> Hi linux-firmware maintainers,
>>>
>>> Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
>>>
>>> The following changes since commit
>>> commit b0e898fbaf377c99a36aac6fdeb7250003648ca4
>>> linux-firmware: Update firmware file for Intel Bluetooth 9462 (Tue Nov 23 10:29:13 2021 +0530)
>>>
>>> are available in the Git repository at:
>>>
>>> https://github.com/zijun-hu/qca-btfw.git
>>>
>>> for you to fetch changes up to 2d86903a10c2b06fdc84141167030931ac973a3f:
>>> ----------------------------------------------------------------
>>> Zijun Hu (1):
>>> QCA: Update Bluetooth WCN685x firmware to 2.1.0-00297 (Thu Dec 9 16:09:53 2021 +0800)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: QCA Bluetooth WCN685x firmware pull request
2021-12-21 2:56 ` Zijun Hu
@ 2021-12-29 13:30 ` Josh Boyer
0 siblings, 0 replies; 6+ messages in thread
From: Josh Boyer @ 2021-12-29 13:30 UTC (permalink / raw)
To: Zijun Hu; +Cc: Linux Firmware, Rocky Liao, tjiang, Zijun Hu
Pulled and pushed out. Thank you.
josh
On Mon, Dec 20, 2021 at 9:56 PM Zijun Hu <zijuhu@codeaurora.org> wrote:
>
> Hi linux-firmware maintainers
>
> could you pull this updated request?
>
> On 12/17/2021 12:47 PM, Zijun Hu wrote:
> > Hi Josh,
> > i have solved the conflict and update pull request as following.
> > could you pull again?
> >
> > Hi linux-firmware maintainers,
> >
> > Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
> >
> > The following changes since commit
> > commit f682ecb015df087613f91872712eb6c0f6c998a8
> > Merge https://github.com/pkshih/linux-firmware into main (Thu Dec 16 09:42:51 2021 -0500)
> >
> > are available in the Git repository at:
> >
> > https://github.com/zijun-hu/qca-btfw.git
> >
> > for you to fetch changes up to 1500362ad671e202a0ccec37064528395daf5936:
> > ----------------------------------------------------------------
> > Zijun Hu (1):
> > QCA: Update Bluetooth WCN685x firmware to 2.1.0-00298 (Fri Dec 17 12:28:26 2021 +0800)
> >
> >
> > On 12/16/2021 10:46 PM, Josh Boyer wrote:
> >> This conflicts with the update I just pulled from tjiang.
> >>
> >> remote: Enumerating objects: 7, done.
> >> remote: Counting objects: 100% (7/7), done.
> >> remote: Compressing objects: 100% (3/3), done.
> >> remote: Total 7 (delta 4), reused 7 (delta 4), pack-reused 0
> >> Unpacking objects: 100% (7/7), 81.20 KiB | 1.14 MiB/s, done.
> >> From https://github.com/zijun-hu/qca-btfw
> >> * branch HEAD -> FETCH_HEAD
> >> warning: Cannot merge binary files: qca/nvm_usb_00130201.bin (HEAD vs.
> >> 2d86903a10c2b06fdc84141167030931ac973a3f)
> >> CONFLICT (add/add): Merge conflict in qca/nvm_usb_00130201.bin
> >> Auto-merging qca/nvm_usb_00130201.bin
> >> Auto-merging WHENCE
> >> Automatic merge failed; fix conflicts and then commit the result.
> >>
> >> Can you discuss and see if it's needed?
> >>
> >> josh
> >>
> >> On Thu, Dec 16, 2021 at 3:56 AM Zijun Hu <zijuhu@codeaurora.org> wrote:
> >>>
> >>> Hi linux-firmware maintainers,
> >>>
> >>> Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
> >>>
> >>> The following changes since commit
> >>> commit b0e898fbaf377c99a36aac6fdeb7250003648ca4
> >>> linux-firmware: Update firmware file for Intel Bluetooth 9462 (Tue Nov 23 10:29:13 2021 +0530)
> >>>
> >>> are available in the Git repository at:
> >>>
> >>> https://github.com/zijun-hu/qca-btfw.git
> >>>
> >>> for you to fetch changes up to 2d86903a10c2b06fdc84141167030931ac973a3f:
> >>> ----------------------------------------------------------------
> >>> Zijun Hu (1):
> >>> QCA: Update Bluetooth WCN685x firmware to 2.1.0-00297 (Thu Dec 9 16:09:53 2021 +0800)
^ permalink raw reply [flat|nested] 6+ messages in thread
* QCA Bluetooth WCN685x firmware pull request
@ 2021-12-09 9:47 Zijun Hu
0 siblings, 0 replies; 6+ messages in thread
From: Zijun Hu @ 2021-12-09 9:47 UTC (permalink / raw)
To: linux-firmware; +Cc: Rocky Liao, , tjiang
Hi linux-firmware maintainers,
Here's a pull request for btqca bluetooth driver. Please let me know if you have any problems.
The following changes since commit
commit b0e898fbaf377c99a36aac6fdeb7250003648ca4
linux-firmware: Update firmware file for Intel Bluetooth 9462 (Tue Nov 23 10:29:13 2021 +0530)
are available in the Git repository at:
https://github.com/zijun-hu/qca-btfw.git
for you to fetch changes up to e79f6d3fdf79d7f4938b5b107213937c044035fc:
----------------------------------------------------------------
Zijun Hu (1):
QCA: Update Bluetooth WCN685x firmware to 2.1.0-00297 (Thu Dec 9 16:09:53 2021 +0800)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-29 13:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 8:56 QCA Bluetooth WCN685x firmware pull request Zijun Hu
2021-12-16 14:46 ` Josh Boyer
2021-12-17 4:47 ` Zijun Hu
2021-12-21 2:56 ` Zijun Hu
2021-12-29 13:30 ` Josh Boyer
-- strict thread matches above, loose matches on Subject: below --
2021-12-09 9:47 Zijun Hu
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).