linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@codeaurora.org>
To: Wright Feng <wright.feng@cypress.com>
Cc: linux-wireless@vger.kernel.org,
	Arend van Spriel <arend.vanspriel@broadcom.com>,
	chi-hsien.lin@cypress.com,
	Johannes Berg <johannes@sipsolutions.net>,
	wright.feng@cypress.com, brcm80211-dev-list@broadcom.com,
	brcm80211-dev-list@cypress.com,
	Franky Lin <franky.lin@broadcom.com>,
	Hante Meuleman <hante.meuleman@broadcom.com>,
	Kurt Lee <kurt.lee@cypress.com>
Subject: Re: [PATCH v2 2/2] brcmfmac: Support DPP feature
Date: Wed,  9 Dec 2020 07:21:59 +0000 (UTC)	[thread overview]
Message-ID: <20201209072159.354AAC433ED@smtp.codeaurora.org> (raw)
In-Reply-To: <20201012084347.121557-3-wright.feng@cypress.com>

Wright Feng <wright.feng@cypress.com> wrote:

> From: Kurt Lee <kurt.lee@cypress.com>
> 
> Let driver parse DPP(Device Provisioning Protocol) frames from upper
> layer and do corresponding configuration to firmware.
> 
> Signed-off-by: Kurt Lee <kurt.lee@cypress.com>
> Signed-off-by: Wright Feng <wright.feng@cypress.com>

Failed to apply:

Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c'
error: Failed to merge in the changes.
Applying: brcmfmac: Support DPP feature
Using index info to reconstruct a base tree...
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Patch failed at 0001 brcmfmac: Support DPP feature
The copy of the patch that failed is found in: .git/rebase-apply/patch

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20201012084347.121557-3-wright.feng@cypress.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


      reply	other threads:[~2020-12-09  7:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12  8:43 [PATCH v2 0/2] brcmfmac: add DPP feature support Wright Feng
2020-10-12  8:43 ` [PATCH v2 1/2] ieee80211: Add definition for WFA DPP Wright Feng
2020-10-12  8:43 ` [PATCH v2 2/2] brcmfmac: Support DPP feature Wright Feng
2020-12-09  7:21   ` Kalle Valo [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=20201209072159.354AAC433ED@smtp.codeaurora.org \
    --to=kvalo@codeaurora.org \
    --cc=arend.vanspriel@broadcom.com \
    --cc=brcm80211-dev-list@broadcom.com \
    --cc=brcm80211-dev-list@cypress.com \
    --cc=chi-hsien.lin@cypress.com \
    --cc=franky.lin@broadcom.com \
    --cc=hante.meuleman@broadcom.com \
    --cc=johannes@sipsolutions.net \
    --cc=kurt.lee@cypress.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=wright.feng@cypress.com \
    /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).