linux-firmware.lore.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zijun Hu <zijuhu@codeaurora.org>
To: Josh Boyer <jwboyer@kernel.org>,
	Linux Firmware <linux-firmware@kernel.org>
Cc: Rocky Liao <rjliao@codeaurora.org>,
	tjiang@codeaurora.org, Zijun Hu <quic_zijuhu@quicinc.com>
Subject: Re: QCA Bluetooth WCN685x firmware pull request
Date: Tue, 21 Dec 2021 10:56:13 +0800	[thread overview]
Message-ID: <4c42da13-337b-b862-699a-661fed8f8909@codeaurora.org> (raw)
In-Reply-To: <82e89316-bc66-b56a-a57f-8d168575a767@codeaurora.org>

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)

  reply	other threads:[~2021-12-21  2:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2021-12-29 13:30       ` Josh Boyer
  -- strict thread matches above, loose matches on Subject: below --
2021-12-09  9:47 Zijun Hu

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=4c42da13-337b-b862-699a-661fed8f8909@codeaurora.org \
    --to=zijuhu@codeaurora.org \
    --cc=jwboyer@kernel.org \
    --cc=linux-firmware@kernel.org \
    --cc=quic_zijuhu@quicinc.com \
    --cc=rjliao@codeaurora.org \
    --cc=tjiang@codeaurora.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 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).