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

Kalle Valo
2021-06-15T13:12:37Z

Yang Shen <shenyang39@huawei.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@gmail.com>
> Signed-off-by: Yang Shen <shenyang39@huawei.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.

--