Jason Yan <yanaijie@xxxxxxxxxx> wrote: > Fix the following coccicheck warning: > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1781:9-12: > WARNING: Comparison to bool > drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1785:5-8: > WARNING: Comparison to bool > > Signed-off-by: Jason Yan <yanaijie@xxxxxxxxxx> > Reviewed-by: Chi-hsien Lin <chi-hsien.lin@xxxxxxxxxxx> Failed to apply, please rebase to top of wireless-drivers-next and send v2. Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c' error: Failed to merge in the changes. Applying: brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame() Using index info to reconstruct a base tree... M drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c Patch failed at 0001 brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame() The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/patch/11525539/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
