netdev - Re: [PATCH v2] ipw2x00: Minor documentation update

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>] [day] [month] [year] [list]

Message-ID: <CAFqt6zY-eXTALDeLknCMpvCi1BCsN9QSrdqUnn-XrokHoTdbaw@mail.gmail.com>
Date:   Thu, 24 Jun 2021 00:48:48 +0530
From:   Souptick Joarder <jrdr.linux@...il.com>
To:     Kalle Valo <kvalo@...eaurora.org>
Cc:     stas.yakovlev@...il.com, "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        linux-wireless <linux-wireless@...r.kernel.org>,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
        Randy Dunlap <rdunlap@...radead.org>
Subject: Re: [PATCH v2] ipw2x00: Minor documentation update

On Tue, Jun 15, 2021 at 7:05 PM Kalle Valo <kvalo@...eaurora.org> wrote:
>
> Souptick Joarder <jrdr.linux@...il.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@...el.com>
> > Signed-off-by: Souptick Joarder <jrdr.linux@...il.com>
> > Cc: Randy Dunlap <rdunlap@...radead.org>
> > Acked-by: Randy Dunlap <rdunlap@...radead.org>
>
> 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@gmail.com/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
>