From patchwork Thu Feb 15 02:29:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 201230 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp125085dyb; Wed, 14 Feb 2024 18:30:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUafRzC9kNFxR0RwENlR0BCnZAYsO3JxsstAoYprQIw9nYDalSKppfh8pqpMInDVILRRae/+89qXwW9ZNRIpw8njZAqDg== X-Google-Smtp-Source: AGHT+IHSCKXyUUlN3hKbuoLRzP1i0RB+IE4iLX1O+qEN2s1l0RUmFMLpc1wJmy8xAqD2GytHDy2q X-Received: by 2002:a17:906:4ed0:b0:a3c:21ec:5baa with SMTP id i16-20020a1709064ed000b00a3c21ec5baamr216228ejv.20.1707964223921; Wed, 14 Feb 2024 18:30:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707964223; cv=pass; d=google.com; s=arc-20160816; b=Zs6UJtcBj2jb8VB8rmO4/UhO+CXtNiqqxJ4HRgx3XVkMo00xD4qGT1T4uRHoKnhOn/ n6vCIvOP9ShH50FyJo9PL5djbNISXDliYO/YajwICio3e+kUW2yeOpEz9XaOmvvVWCJ2 Bs/N33Y88t2Nyx3Fq2c8eTWP2Sb9Ijtv1JNk6Xzd8Y55KNR1zHs5GdxTxWcceDAFsZ+U 3W3y4P4iO5LHoXMntov0iyzEpRIyPWg3ajJ6dY3xszuPnfi3DdsEBbPt6r2b70PkiBN1 8FnBKfyEdbMAGX7To3BVC1lmqM9epzRUFFiWXm/LM4nE6dkUOkfZo5M4HwbDD/9GHtq/ isYw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=90YqM914shKUVf/nn8h70J6ciK5KWSzDwzEM9f+oKzc=; fh=0cur1rDgzM7Wy4AMclMmhyAiBVzi5D8YHA7mHhBe+x4=; b=FWpnZhEjAYnZDG2aEAsurM7MEn8dPwq3bncOtdaXyeDYP47+9EI/gW3UwvG3rrbrki +W4ZbyF70E6tE1smKEzaBChZwDQK+UuD69oKO/mtCM7NXf1jRaogtRrneg7gNxWhqeyH 7mbEsIElNyHZ7MrTkJvumDK0tUjpv/Qnxc1RkXR0TzUV2LVpJ7E0nVgK28imNGCq+iSf IF4k4Z8HvHFEtyQPrfEOQ0jmbtQ6G9JznjygXymooKO3A2iNpcxHgIOYMLIWhu754qmv oq7DmkLRFmlYaIN/6VnNlxF+qYQxG9bS1xtAvUkg0rCzOs2uMeycyRAvIh3+1vlyDXcv CgsA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=aYrZu5gx; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-66240-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66240-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id jp27-20020a170906f75b00b00a3d4835d734si159151ejb.167.2024.02.14.18.30.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 18:30:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-66240-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=aYrZu5gx; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-66240-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66240-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 85D8A1F2487E for ; Thu, 15 Feb 2024 02:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B1A94A05; Thu, 15 Feb 2024 02:30:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="aYrZu5gx" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26DE03FEF; Thu, 15 Feb 2024 02:30:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707964208; cv=none; b=NEyf9Yc3S3G3zY4C1ydWC6J5FlLBUOfZZNuAgM9IhwjENh74+0nZM95CAMozOpxiRhRwOueGZoyhmsfdt0bSYzNsAy8hiUsFjcZ8df1IKlQa9UaEaDWhkw1OVKaQ9ft5ymKfjVxjJRoxhdUosjJcEUN5JeMyHzFeXnnv+HmhOXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707964208; c=relaxed/simple; bh=LVa6TQR2ubWCWAbXH9G7raC0OPAwoLfUp9WeQppAu/g=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=m11jK5u2EZToFq6FQ0rkazBJAETCg+WK2YYG1SnHr8KDHMHySAketH1/c43sAeiHDwW8NEJEg6fn9/4SWsIste1vKZ+9DJ0p5j5Ti27OTYaLTjSEDxrzLxvqJn1rW1W/lPlpIyRVDqcoW16VxwWszFjTIPPVbmn3k+zlHbtlzkk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=aYrZu5gx; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1707964194; bh=90YqM914shKUVf/nn8h70J6ciK5KWSzDwzEM9f+oKzc=; h=Date:From:To:Cc:Subject:From; b=aYrZu5gxYRwUPGVKk/7mIVn1i14IjgI6BmCOcv/uUyS1E/LEfR4v3AoiV8ImdMvpX b83R6FdjM6lTXQMvrMO9gHo44v1t4xk1vXpjYsIlX2BRXu8t5JeDsxM6nh/AWRLfjE HmqRl3EahDyUwdji6P7lHC/Lk3pYUtzNtCZNRMTn7QXp5yawGFPiqo9AqjNWgUP/F/ n8/pXXK6oqeIJc70K8WjqADD5xixdvW/17/lectvEtqa5YcvN0yxgRrUWKV6eRAi32 rCyyjIuCpzbuwb7ejuyeNwms6R8cH3T79ZfvHyp9ZhIYAZFHeMr6lzj7Nuf9MtvHaE wv2KRLpA+t9eg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TZzYF2n1cz4wcN; Thu, 15 Feb 2024 13:29:53 +1100 (AEDT) Date: Thu, 15 Feb 2024 13:29:52 +1100 From: Stephen Rothwell To: Krzysztof Kozlowski , Greg KH Cc: Francesco Dolcini , Greg Kroah-Hartman , Christoph Winklhofer , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the w1 tree Message-ID: <20240215132952.6c83ab23@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790930293704553676 X-GMAIL-MSGID: 1790930293704553676 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 (*)(struct serdev_device *, const u8 *, size_t)' {aka 'long unsigned int (*)(struct serdev_device *, const unsigned char *, long unsigned int)'} from incompatible pointer type 'ssize_t (*)(struct serdev_device *, const u8 *, size_t)' {aka 'long int (*)(struct serdev_device *, const unsigned char *, long unsigned int)'} [-Werror=incompatible-pointer-types] 314 | .receive_buf = w1_uart_serdev_receive_buf, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/w1/masters/w1-uart.c:314:24: note: (near initialization for 'w1_uart_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 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 size_t" Signed-off-by: Stephen Rothwell --- 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; } -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 = serdev_device_get_drvdata(serdev);