From: Kalle Valo <kvalo@codeaurora.org>
To: Yang Shen <shenyang39@huawei.com>
Cc: <linux-wireless@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Yang Shen" <shenyang39@huawei.com>,
Stanislav Yakovlev <stas.yakovlev@gmail.com>
Subject: Re: [05/11] ipw2x00: Fix wrong function name in comments
Date: Tue, 15 Jun 2021 13:12:10 +0000 (UTC) [thread overview]
Message-ID: <20210615131210.1599EC4338A@smtp.codeaurora.org> (raw)
In-Reply-To: <20210517050141.61488-6-shenyang39@huawei.com>
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.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210517050141.61488-6-shenyang39@huawei.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2021-06-15 13:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 5:01 [PATCH 00/11] Rid W=1 warnings in wireless Yang Shen
2021-05-17 5:01 ` [PATCH 01/11] net: ath: ath5k: Fix wrong function name in comments Yang Shen
2021-06-15 14:01 ` Kalle Valo
2021-05-17 5:01 ` [PATCH 02/11] net: ath: " Yang Shen
2021-05-17 5:01 ` [PATCH 03/11] net: ath: wil6210: " Yang Shen
2021-05-17 5:01 ` [PATCH 04/11] net: broadcom: brcmfmac: Demote non-compliant kernel-doc headers Yang Shen
2021-05-19 12:41 ` Arend van Spriel
2021-06-15 10:37 ` [04/11] " Kalle Valo
2021-05-17 5:01 ` [PATCH 05/11] net: intel: ipw2x00: Fix wrong function name in comments Yang Shen
2021-05-17 16:30 ` Stanislav Yakovlev
2021-06-15 13:12 ` Kalle Valo [this message]
2021-06-18 7:00 ` [05/11] " Yang Shen
2021-05-17 5:01 ` [PATCH 06/11] net: intel: iwlwifi: Demote non-compliant kernel-doc headers Yang Shen
2021-05-18 3:08 ` Yang Shen
2021-05-17 5:01 ` [PATCH 07/11] net: marvell: libertas_tf: Fix wrong function name in comments Yang Shen
2021-06-15 13:11 ` [07/11] " Kalle Valo
2021-05-17 5:01 ` [PATCH 08/11] net: realtek: rtlwifi: " Yang Shen
2021-05-17 5:01 ` [PATCH 09/11] net: rsi: Fix missing " Yang Shen
2021-05-17 5:01 ` [PATCH 10/11] net: ti: wl1251: " Yang Shen
2021-06-15 13:39 ` [10/11] " Kalle Valo
2021-05-17 5:01 ` [PATCH 11/11] net: ti: wlcore: " Yang Shen
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=20210615131210.1599EC4338A@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=shenyang39@huawei.com \
--cc=stas.yakovlev@gmail.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