Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 34EAD6076C
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [PATCH V2 3/3] brcmfmac: add support for SAE authentication
 offload
From:   Kalle Valo <kvalo@codeaurora.org>
In-Reply-To: <1557395332-41426-4-git-send-email-chi-hsien.lin@cypress.com>
References: <1557395332-41426-4-git-send-email-chi-hsien.lin@cypress.com>
To:     Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com>
Cc:     "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
        "brcm80211-dev-list@broadcom.com" <brcm80211-dev-list@broadcom.com>,
        brcm80211-dev-list <brcm80211-dev-list@cypress.com>,
        Arend van Spriel <arend.vanspriel@broadcom.com>,
        Franky Lin <franky.lin@broadcom.com>,
        Hante Meuleman <hante.meuleman@broadcom.com>,
        Wright Feng <Wright.Feng@cypress.com>,
        Stanley Hsu <Stanley.Hsu@cypress.com>,
        Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com>
User-Agent: pwcli/0.0.0-git (https://github.com/kvalo/pwcli/) Python/2.7.12
Message-Id: <20191001091259.0B62A6081C@smtp.codeaurora.org>
Date:   Tue,  1 Oct 2019 09:12:59 +0000 (UTC)
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com> wrote:

> From: Chung-Hsien Hsu <stanley.hsu@cypress.com>
> 
> The firmware may have SAE authentication code built-in. This is
> detected by the driver and indicated in the wiphy features flags.
> User-space can use this flag to determine whether or not to provide
> the password material for SAE authentication in the nl80211 CONNECT
> command.
> 
> Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
> Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>

Failed to apply, please rebase and resend.

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

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/patch/10936953/

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