Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <1619348088-6887-1-git-send-email-jrdr.linux@gmail.com> <20210615133503.DA3B9C43149@smtp.codeaurora.org>
In-Reply-To: <20210615133503.DA3B9C43149@smtp.codeaurora.org>
From:   Souptick Joarder <jrdr.linux@gmail.com>
Date:   Thu, 24 Jun 2021 00:48:48 +0530
Message-ID: <CAFqt6zY-eXTALDeLknCMpvCi1BCsN9QSrdqUnn-XrokHoTdbaw@mail.gmail.com>
Subject: Re: [PATCH v2] ipw2x00: Minor documentation update
To:     Kalle Valo <kvalo@codeaurora.org>
Cc:     stas.yakovlev@gmail.com, "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        linux-wireless <linux-wireless@vger.kernel.org>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Randy Dunlap <rdunlap@infradead.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Jun 15, 2021 at 7:05 PM Kalle Valo <kvalo@codeaurora.org> wrote:
>
> 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.

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
>