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_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 808C1C432BE for ; Wed, 28 Jul 2021 12:04:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69F4260F91 for ; Wed, 28 Jul 2021 12:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234907AbhG1MEP (ORCPT ); Wed, 28 Jul 2021 08:04:15 -0400 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:44165 "EHLO cmccmta1.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234882AbhG1MEJ (ORCPT ); Wed, 28 Jul 2021 08:04:09 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.11]) by rmmx-syy-dmz-app01-12001 (RichMail) with SMTP id 2ee161014794d62-a754f; Wed, 28 Jul 2021 20:03:32 +0800 (CST) X-RM-TRANSID: 2ee161014794d62-a754f X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from [192.168.26.114] (unknown[10.42.68.12]) by rmsmtp-syy-appsvr06-12006 (RichMail) with SMTP id 2ee661014793ec2-c63e1; Wed, 28 Jul 2021 20:03:32 +0800 (CST) X-RM-TRANSID: 2ee661014793ec2-c63e1 Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Mark Brown , David Miller , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , wengjianfeng References: <20210728105423.1064-1-broonie@kernel.org> From: tangbin Message-ID: <72a0bb43-3c60-7958-062b-c77037d9e725@cmss.chinamobile.com> Date: Wed, 28 Jul 2021 20:03:58 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20210728105423.1064-1-broonie@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Mark: On 2021/7/28 18:54, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/nfc/s3fwrn5/firmware.c > > between commit: > > 801e541c79bb ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") Yesterday, I have send this patch to fix the problem. And nathan proposed another way to fix this problem, so I send v2 for maintainer today. And waiting for the result. Thanks Tang Bin > > from the net tree and commit: > > a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > diff --cc drivers/nfc/s3fwrn5/firmware.c > index 1340fab9565e,1421ffd46d9a..000000000000 > --- a/drivers/nfc/s3fwrn5/firmware.c > +++ b/drivers/nfc/s3fwrn5/firmware.c > @@@ -421,10 -421,9 +421,9 @@@ int s3fwrn5_fw_download(struct s3fwrn5_ > > tfm = crypto_alloc_shash("sha1", 0, 0); > if (IS_ERR(tfm)) { > - ret = PTR_ERR(tfm); > dev_err(&fw_info->ndev->nfc_dev->dev, > - "Cannot allocate shash (code=%d)\n", ret); > + "Cannot allocate shash (code=%ld)\n", PTR_ERR(tfm)); > - goto out; > + return PTR_ERR(tfm); > } > > ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);