Received-SPF: pass (google.com: domain of linux-kernel+bounces-66240-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Thu, 15 Feb 2024 13:29:52 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Greg KH
 <greg@kroah.com>
Cc: Francesco Dolcini <francesco.dolcini@toradex.com>, Greg Kroah-Hartman
 <gregkh@linuxfoundation.org>, Christoph Winklhofer
 <cj.winklhofer@gmail.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the w1 tree
Message-ID: <20240215132952.6c83ab23@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/zKc9Ct.VwZnhFkAum=xP6yt";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/zKc9Ct.VwZnhFkAum=xP6yt
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the w1 tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/w1/masters/w1-uart.c:314:24: error: initialization of 'size_t (*)(s=
truct serdev_device *, const u8 *, size_t)' {aka 'long unsigned int (*)(str=
uct serdev_device *, const unsigned char *, long unsigned int)'} from incom=
patible pointer type 'ssize_t (*)(struct serdev_device *, const u8 *, size_=
t)' {aka 'long int (*)(struct serdev_device *, const unsigned char *, long =
unsigned int)'} [-Werror=3Dincompatible-pointer-types]
  314 |         .receive_buf =3D w1_uart_serdev_receive_buf,
      |                        ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/w1/masters/w1-uart.c:314:24: note: (near initialization for 'w1_uar=
t_serdev_ops.receive_buf')

Caused by commit

  178cf9db9e6d ("w1: add UART w1 bus driver")

interacting with commit

  fed99212acae ("treewide, serdev: change receive_buf() return type to size=
_t")

from the tty tree.

I have applied the following merge resolution patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Feb 2024 13:23:35 +1100
Subject: [PATCH] fixup for "w1: add UART w1 bus driver"

interacting with "treewide, serdev: change receive_buf() return type to siz=
e_t"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/w1/masters/w1-uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/w1/masters/w1-uart.c b/drivers/w1/masters/w1-uart.c
index 6950d29d7dac..a31782e56ba7 100644
--- a/drivers/w1/masters/w1-uart.c
+++ b/drivers/w1/masters/w1-uart.c
@@ -289,7 +289,7 @@ static int w1_uart_serdev_tx_rx(struct w1_uart_device *=
w1dev,
 	return ret;
 }
=20
-static ssize_t w1_uart_serdev_receive_buf(struct serdev_device *serdev,
+static size_t w1_uart_serdev_receive_buf(struct serdev_device *serdev,
 					  const u8 *buf, size_t count)
 {
 	struct w1_uart_device *w1dev =3D serdev_device_get_drvdata(serdev);
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/zKc9Ct.VwZnhFkAum=xP6yt
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXNdyAACgkQAVBC80lX
0Gx0nggAlsDOQAnBfleT5Q1ZDV4jaUlLKb+L0t8Q/6kEqIrC3bzx6XAC7UNc2HMk
5zngyK+OgfuKoluQ9WBYcoRPAYmoG0T78yuttueSuLLZ5qz0vfQJEd/fDVnMSG0V
XFRWK2Hha8ezHBMVjtR5w7TWdtGOkMbGomO6QY4yGDm6HOeahF/9L/3GHURpHznV
1bUeBbTYzbMc8TXm9nEC32FtkrE1uSegOjdhZZhIX7CNieuoBLJxXXyycuPlafG3
SG6CBrxh8FWZ8AHgITq/dVjR0jw1CfFNc+CjFMj4/oOVtBfBHG1/l4Fbdx/FL7tB
wynOk/EM8degtY+I1CWAwKSYdrrvSw==
=x4BQ
-----END PGP SIGNATURE-----

--Sig_/zKc9Ct.VwZnhFkAum=xP6yt--