Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [05/11] ipw2x00: Fix wrong function name in comments
To:     Kalle Valo <kvalo@codeaurora.org>
References: <20210517050141.61488-6-shenyang39@huawei.com>
 <20210615131210.1599EC4338A@smtp.codeaurora.org>
CC:     <linux-wireless@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Stanislav Yakovlev <stas.yakovlev@gmail.com>
From:   Yang Shen <shenyang39@huawei.com>
Message-ID: <6f3782fe-1e84-d700-c902-26921a93f41b@huawei.com>
Date:   Fri, 18 Jun 2021 15:00:11 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.7.1
MIME-Version: 1.0
In-Reply-To: <20210615131210.1599EC4338A@smtp.codeaurora.org>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

Got it, I'll rebase on the latest branch.

On 2021/6/15 21:12, Kalle Valo wrote:
> 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.
>