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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 13099CCFA18 for ; Tue, 11 Nov 2025 19:17:53 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4d5bsD3Xx7z2yvK; Wed, 12 Nov 2025 06:17:52 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c0a:e001:78e:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1762888672; cv=none; b=duaNs/qWAV8DOIfkcQHtAxfk38aS8VEQD3F8CDMOBeNKgtjy4j4npbSqJrGf3rC0aXw367SgS90kIhSbfi6KUJ8sN4TCmXH3bjZhSjnRZfUAQKYiPy9vvIWlGS1BiCw+IEgAk15l2gY9nUyv/D7gEEJHps/s8QAxVTQR+tySc9jJOnIC7i5PglxWJ9TOPFz+v0LjDGaySJqV6g7AqtaWQoZXW/7nph2mFV0JFPNXCR0YJ5Xwmzo/1vOGi9FbCG7eR3fZSMCZMBbISq5Hq78/GirtYOquIHCxIeI1cSBd9MX3KIaggVDehhpvKKHkA4zKd0h0EOFkWTSwq/xQrllPHQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1762888672; c=relaxed/relaxed; bh=Gq4OYm6IJVW0ysZKlScrQA08mwLQ6YFMo97/reDWBt4=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Bs8mCVZXnrkFYZpo4z69RZcv2DGf9CryBZ6LNXJ15gkL1GlHlfkgLTI5rcgA2winQTvTI/+S6c2pwbV4ZPPd/Z20LIWd2ODoSU1inbk/lws9MTbZ1Hwbd4LtRHzLva6zAMQrbYe8Jy1cZka1461s9naWpcOuRKb5gSYI8AaWePht9SC0oj/WPaubkyc3+V6yHcWmAVV1HuefqgTcQA1ND8oWUA0gd/cErRgj4elx7dDNxS9LAJeRdjzOY/WsZYE8XKjk8zHf8xJsiRT/x5Qn5gJKge9daxfsxs+H8WqWrd6PKeFsPE1kzK0zPUcXLpP4YOAPtN9ZdFVEu61axz9ZLQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=WAB3TiSt; dkim-atps=neutral; spf=pass (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=jic23@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=WAB3TiSt; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=jic23@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [IPv6:2600:3c0a:e001:78e:0:1991:8:25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4d5bsC2zTFz2yN1 for ; Wed, 12 Nov 2025 06:17:51 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 63312438C0; Tue, 11 Nov 2025 19:17:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D8EDC4CEFB; Tue, 11 Nov 2025 19:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762888668; bh=41RLRtaKbXKVyhTCyKGvYapSSOb8728iYPhMLtH1kSQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=WAB3TiStxkM1FNwO8Op8NHHDZWFMtIxWcQcyMeysB/zEXMu7NC5jN7X7oCAZuO/uB kcb7FtT/bygYU7KdFv5BXUDnSmTnFkOZ8nnrMugK3rc8YAb9Myqj0+j/30pn8eY8Mi FkINs55JVB5sRHCnTlFQ5BMCeVelWSh/mOsZSAa3tc2o2UVRqLAHzjnGrk3XfMFmKE yUZtkwYIljsWxIjRlVV5OUJuG4eBUG7Ex4ojuJLvn0I0Ye5hWgfKtnWEOSOBCHSp4c JDb7nCKhP6NvnxojBfFa0FUjKp21Eg/jL89c2RHwG69wReDvu3Q1lYYDIxR5d/e8TK 8F/IQbicLA9ig== Date: Tue, 11 Nov 2025 19:17:33 +0000 From: Jonathan Cameron To: Geert Uytterhoeven Cc: Michael Turquette , Stephen Boyd , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Giovanni Cabiddu , Herbert Xu , David Miller , Linus Walleij , Bartosz Golaszewski , Joel Stanley , Andrew Jeffery , Crt Mori , Lars-Peter Clausen , Jacky Huang , Shan-Chun Hung , Yury Norov , Rasmus Villemoes , Jaroslav Kysela , Takashi Iwai , Johannes Berg , Jakub Kicinski , Alex Elder , David Laight , Vincent Mailhol , Jason Baron , Borislav Petkov , Tony Luck , Michael Hennerich , Kim Seer Paller , David Lechner , Nuno =?UTF-8?B?U8Oh?= , Andy Shevchenko , Richard Genoud , Cosmin Tanislav , Biju Das , Jianping Shen , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-crypto@vger.kernel.org, linux-edac@vger.kernel.org, qat-linux@intel.com, linux-gpio@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-iio@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH -next v5 10/23] iio: imu: smi330: #undef field_{get,prep}() before definition Message-ID: <20251111191351.06c0e660@jic23-huawei> In-Reply-To: References: <97549838f28a1bb7861cfb42ee687f832942b13a.1761588465.git.geert+renesas@glider.be> <20251102104326.0f1db96a@jic23-huawei> <20251109125956.106c9a1a@jic23-huawei> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.51; x86_64-pc-linux-gnu) X-Mailing-List: linux-aspeed@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 10 Nov 2025 09:59:34 +0100 Geert Uytterhoeven wrote: > Hi Jonathan, Hi Geert, > > On Sun, 9 Nov 2025 at 14:01, Jonathan Cameron wrote: > > On Mon, 3 Nov 2025 11:09:36 +0100 > > Geert Uytterhoeven wrote: > > > On Sun, 2 Nov 2025 at 11:43, Jonathan Cameron wrote: > > > > On Mon, 27 Oct 2025 19:41:44 +0100 > > > > Geert Uytterhoeven wrote: > > > > > > > > > Prepare for the advent of globally available common field_get() and > > > > > field_prep() macros by undefining the symbols before defining local > > > > > variants. This prevents redefinition warnings from the C preprocessor > > > > > when introducing the common macros later. > > > > > > > > > > Suggested-by: Yury Norov > > > > > Signed-off-by: Geert Uytterhoeven > > > > > > > > So this is going to make a mess of merging your series given this is > > > > queued up for next merge window. > > > > > > > > I can pick this one up perhaps and we loop back to the replacement of > > > > these in a future patch? Or perhaps go instead with a rename > > > > of these two which is probably nicer in the intermediate state than > > > > undefs. > > > > > > Renaming would mean a lot of churn. > > > Just picking up the #undef patch should be simple and safe? The > > > removal of the underf and redef can be done in the next cycle. > > > Thanks! > > > > Only 1 call of each of these in the driver, so churn is small either way. > > > > To avoid a bisection problem if your tree merges first I need to modify > > this stuff in the original patch or leave it for Linus to deal with as > > a merge conflict resolution which is mess I'd rather do without. > > If you add the #undef, there won't be any bisection problem? Two different things. The bisection comment was about squashing into the original driver patch - not what was squashed. Your tree may well merge before mine does and a bisection could therefore land in between the driver introduction and a patch I merge today. The rename is a preference only because I don't want an undef that smells like a hack / bug work around kicking around in the tree for significant time (probably a whole kernel cycle). In this case the churn is very similar with that or a rename of the macros - so rename it is. Jonathan > Gr{oetje,eeting}s, > > Geert >