From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD3FC48BDF for ; Fri, 18 Jun 2021 07:00:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31E4A61369 for ; Fri, 18 Jun 2021 07:00:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231250AbhFRHC2 (ORCPT ); Fri, 18 Jun 2021 03:02:28 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:8270 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229816AbhFRHCY (ORCPT ); Fri, 18 Jun 2021 03:02:24 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4G5qRw3s2Nz1BG5V; Fri, 18 Jun 2021 14:55:08 +0800 (CST) Received: from dggema704-chm.china.huawei.com (10.3.20.68) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Fri, 18 Jun 2021 15:00:12 +0800 Received: from [10.69.38.207] (10.69.38.207) by dggema704-chm.china.huawei.com (10.3.20.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Fri, 18 Jun 2021 15:00:11 +0800 Subject: Re: [05/11] ipw2x00: Fix wrong function name in comments To: Kalle Valo References: <20210517050141.61488-6-shenyang39@huawei.com> <20210615131210.1599EC4338A@smtp.codeaurora.org> CC: , , Stanislav Yakovlev From: Yang Shen 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 X-Originating-IP: [10.69.38.207] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggema704-chm.china.huawei.com (10.3.20.68) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Got it, I'll rebase on the latest branch. On 2021/6/15 21:12, Kalle Valo wrote: > Yang Shen 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 >> Signed-off-by: Yang Shen > > 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. >