Re: [PATCH v2] ipw2x00: Minor documentation update

[Souptick Joarder]

On Tue, Jun 15, 2021 at 7:05 PM Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote:
>
> Souptick Joarder <jrdr.linux@xxxxxxxxx> 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@xxxxxxxxx>
> > Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx>
> > Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> > Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
>
> Fails to apply, please rebase.

Sure.
>
> 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@xxxxxxxxx/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
>