quoted

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()")

from the net tree and commit:

quoted

 a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label")

quoted

from the net-next tree.

quoted

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.

quoted

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,

quoted

-	"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);

Hi Mark,  
  Thanks for you fix the issue, I'll pay attention to this later.