From: Kalle Valo <kvalo@codeaurora.org>
To: Souptick Joarder <jrdr.linux@gmail.com>
Cc: stas.yakovlev@gmail.com, davem@davemloft.net, kuba@kernel.org,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Souptick Joarder <jrdr.linux@gmail.com>,
Randy Dunlap <rdunlap@infradead.org>
Subject: Re: [PATCH v2] ipw2x00: Minor documentation update
Date: Tue, 15 Jun 2021 13:35:03 +0000 (UTC) [thread overview]
Message-ID: <20210615133504.1900CC4314A@smtp.codeaurora.org> (raw)
In-Reply-To: <1619348088-6887-1-git-send-email-jrdr.linux@gmail.com>
Souptick Joarder <jrdr.linux@gmail.com> wrote:
> Kernel test robot throws below warning ->
>
> 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
>
> Minor update in documentation.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
Fails 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: Minor documentation update
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: Minor documentation update
Patch set to Changes Requested.
--
https://patchwork.kernel.org/project/linux-wireless/patch/1619348088-6887-1-git-send-email-jrdr.linux@gmail.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2021-06-15 13:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-25 10:54 [PATCH v2] ipw2x00: Minor documentation update Souptick Joarder
2021-04-25 16:10 ` Randy Dunlap
2021-06-15 13:35 ` Kalle Valo [this message]
[not found] ` <20210615133503.DA3B9C43149@smtp.codeaurora.org>
2021-06-23 19:18 ` Souptick Joarder
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=20210615133504.1900CC4314A@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=jrdr.linux@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rdunlap@infradead.org \
--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;
as well as URLs for NNTP newsgroup(s).