From: Mikhail Rudenko <mike.rudenko@gmail.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org,
Arend van Spriel <arend.vanspriel@broadcom.com>
Subject: Re: [PATCH v2] brcmfmac: use separate firmware for 43430 revision 2
Date: Mon, 16 Aug 2021 16:59:38 +0300 [thread overview]
Message-ID: <87y291zdp7.fsf@gmail.com> (raw)
In-Reply-To: <20210801102503.C56E4C433F1@smtp.codeaurora.org>
Hi, Kalle!
On 2021-08-01 at 10:25 GMT, Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Failed to apply to wireless-drivers-next, please rebase.
>
> Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c'
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Applying: brcmfmac: use separate firmware for 43430 revision 2
> Using index info to reconstruct a base tree...
> M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2
>
> Patch set to Changes Requested.
I've posted a rebased v3 [1]. Anything else to do for this patch?
[1] https://lore.kernel.org/linux-wireless/20210804231308.576071-1-mike.rudenko@gmail.com/
--
Kind regards,
Mikhail
prev parent reply other threads:[~2021-08-16 14:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 23:30 [PATCH] brcmfmac: use separate firmware for 43430 revision 2 Mikhail Rudenko
2021-05-10 8:06 ` Arend van Spriel
2021-05-14 9:41 ` Mikhail Rudenko
2021-05-21 13:22 ` Mikhail Rudenko
2021-06-24 16:39 ` Kalle Valo
2021-06-28 10:11 ` Arend van Spriel
2021-06-28 12:16 ` Arend van Spriel
2021-06-28 14:05 ` Mikhail Rudenko
2021-06-28 14:54 ` [PATCH v2] " Mikhail Rudenko
2021-08-01 10:25 ` Kalle Valo
2021-08-04 23:13 ` [PATCH v3] " Mikhail Rudenko
2021-08-21 16:58 ` Kalle Valo
2021-08-16 13:59 ` Mikhail Rudenko [this message]
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=87y291zdp7.fsf@gmail.com \
--to=mike.rudenko@gmail.com \
--cc=arend.vanspriel@broadcom.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@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.