linux-kernel - Re: [05/11] ipw2x00: Fix wrong function name in comments

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <6f3782fe-1e84-d700-c902-26921a93f41b@huawei.com>
Date:   Fri, 18 Jun 2021 15:00:11 +0800
From:   Yang Shen <shenyang39@...wei.com>
To:     Kalle Valo <kvalo@...eaurora.org>
CC:     <linux-wireless@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        Stanislav Yakovlev <stas.yakovlev@...il.com>
Subject: Re: [05/11] ipw2x00: Fix wrong function name in comments

Got it, I'll rebase on the latest branch.

On 2021/6/15 21:12, Kalle Valo wrote:
> Yang Shen <shenyang39@...wei.com> wrote:
>
>> Fixes the following W=1 kernel build warning(s):
>>
>>  drivers/net/wireless/intel/ipw2x00/ipw2100.c:5359: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
>>  drivers/net/wireless/intel/ipw2x00/ipw2100.c:6533: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
>>  drivers/net/wireless/intel/ipw2x00/ipw2100.c:6565: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
>>
>> Cc: Stanislav Yakovlev <stas.yakovlev@...il.com>
>> Signed-off-by: Yang Shen <shenyang39@...wei.com>
>
> Failed to apply, please rebase:
>
> Recorded preimage for 'drivers/net/wireless/intel/ipw2x00/ipw2100.c'
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Applying: ipw2x00: Fix wrong function name in comments
> Using index info to reconstruct a base tree...
> M	drivers/net/wireless/intel/ipw2x00/ipw2100.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/intel/ipw2x00/ipw2100.c
> Patch failed at 0001 ipw2x00: Fix wrong function name in comments
>
> Patch set to Changes Requested.
>