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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 58DFCC43381 for ; Tue, 2 Feb 2021 21:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 319E064E4A for ; Tue, 2 Feb 2021 21:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233018AbhBBVjk (ORCPT ); Tue, 2 Feb 2021 16:39:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232062AbhBBVji (ORCPT ); Tue, 2 Feb 2021 16:39:38 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48251C061793 for ; Tue, 2 Feb 2021 13:38:29 -0800 (PST) Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l73KK-0005G0-0Y; Tue, 02 Feb 2021 22:35:12 +0100 Received: from ukl by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1l73KD-000359-6W; Tue, 02 Feb 2021 22:35:05 +0100 Date: Tue, 2 Feb 2021 22:35:02 +0100 From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= To: Russell King , Mathieu Poirier , Suzuki K Poulose , Alexander Shishkin , Greg Kroah-Hartman Cc: linux-fbdev@vger.kernel.org, Cornelia Huck , kvm@vger.kernel.org, David Airlie , Linus Walleij , alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela , Eric Anholt , linux-i2c@vger.kernel.org, Jiri Slaby , linux-stm32@st-md-mailman.stormreply.com, Alexandre Torgue , linux-rtc@vger.kernel.org, Herbert Xu , Takashi Iwai , Krzysztof Kozlowski , Alexandre Belloni , linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Ulf Hansson , Guenter Roeck , Mike Leach , linux-watchdog@vger.kernel.org, Arnd Bergmann , Alessandro Zummo , coresight@lists.linaro.org, Vladimir Zapolskiy , Eric Auger , Alex Williamson , Mark Brown , Matt Mackall , Daniel Vetter , Dan Williams , Wim Van Sebroeck , linux-arm-kernel@lists.infradead.org, Maxime Coquelin , Dmitry Torokhov , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Vinod Koul , linux-crypto@vger.kernel.org, kernel@pengutronix.de, Leo Yan , dmaengine@vger.kernel.org Subject: Re: [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Message-ID: <20210202213502.ya4luwvklbte72sz@pengutronix.de> References: <20210126165835.687514-1-u.kleine-koenig@pengutronix.de> <20210202135350.36nj3dmcoq3t7gcf@pengutronix.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="iy6nspqtdtxt6xyd" Content-Disposition: inline In-Reply-To: <20210202135350.36nj3dmcoq3t7gcf@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-watchdog@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org --iy6nspqtdtxt6xyd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, On Tue, Feb 02, 2021 at 02:53:50PM +0100, Uwe Kleine-K=F6nig wrote: > the following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e= 5e: >=20 > Linux 5.11-rc1 (2020-12-27 15:30:22 -0800) >=20 > are available in the Git repository at: >=20 > https://git.pengutronix.de/git/ukl/linux tags/amba-make-remove-return-v= oid >=20 > for you to fetch changes up to f170b59fedd733b92f58c4d7c8357fbf7601d623: >=20 > amba: Make use of bus_type functions (2021-02-02 14:26:02 +0100) >=20 > I expect this tag to be merged by Russell King as amba maintainer and by > Mathieu Poirier (or Greg Kroah-Hartman?) for coresight as there are some > pending conflicting changes. These are not hard to resolve but also > non-trivial. Tell me if you need assistance for resolving, also if it's o= nly a > second pair of eyes to judge your resolution. Alternatively to my additional patch sent earlier today I prepared a v2 tag at https://git.pengutronix.de/git/ukl/linux tags/amba-make-remove-return-voi= d-v2 with the build fix squashed in. Iff you prefer and both Russell and Greg agree to pull this one instead of the (implicit) v1 we can maybe prevent introducing this build regression in mainline. Please coordinate among you two. And sorry again for breaking the build. Best regards Uwe PS: The range-diff between the original tags/amba-make-remove-return-void and tags/amba-make-remove-return-void-v2 is: 1: 3fd269e74f2f ! 1: 481963c91284 amba: Make the remove callback return v= oid @@ Commit message Acked-by: Vladimir Zapolskiy # for memory/pl172 Acked-by: Greg Kroah-Hartman Link: https://lore.kernel.org/r/20210126165835.687514-5-u.kleine-k= oenig@pengutronix.de + [ukleinek: squashed in a build fix for drivers/mailbox/arm_mhuv2.c] Signed-off-by: Uwe Kleine-K=F6nig =20 ## drivers/amba/bus.c ## @@ drivers/input/serio/ambakmi.c: static int amba_kmi_remove(struct amb= a_device *de =20 static int __maybe_unused amba_kmi_resume(struct device *dev) =20 + ## drivers/mailbox/arm_mhuv2.c ## +@@ drivers/mailbox/arm_mhuv2.c: static int mhuv2_probe(struct amba_dev= ice *adev, const struct amba_id *id) + return ret; + } +=20 +-static int mhuv2_remove(struct amba_device *adev) ++static void mhuv2_remove(struct amba_device *adev) + { + struct mhuv2 *mhu =3D amba_get_drvdata(adev); +=20 + if (mhu->frame =3D=3D SENDER_FRAME) + writel_relaxed(0x0, &mhu->send->access_request); +- +- return 0; + } +=20 + static struct amba_id mhuv2_ids[] =3D { + ## drivers/memory/pl172.c ## @@ drivers/memory/pl172.c: static int pl172_probe(struct amba_device *= adev, const struct amba_id *id) return ret; 2: f170b59fedd7 =3D 2: f30d22a7bfab amba: Make use of bus_type functions --=20 Pengutronix e.K. | Uwe Kleine-K=F6nig | Industrial Linux Solutions | https://www.pengutronix.de/ | --iy6nspqtdtxt6xyd Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmAZxYMACgkQwfwUeK3K 7AnuCggAjiQbE+eiwx7Lq2dUAxw0U6bgjFY/EXIcLCMbTPjdEffSVExAzMT3cTCy zISJDI3QF315/RleMFcnEXrXJl7Ft8SkoEvZfheNfz5JmPu8jPIEUp5giooDmpBi TV/LqBdE+wmy+J7byBdoH8Chvg9RR52u6aJFyj8nzwAoqj/+YiSYcB2nsMtr962B GLNq7i0h7Lj0cZxGVTsh75QuVSyK7yedx7gS4F5wUURJpSa5LzeeWAboWgARpg+M /BIWHX1CAs2JGZQqzJF2hffd/HZhQCWJlgTa1x92sg2Ic62K+ufwdsHlo87Wuo42 N6jvYIoY/t/LHHL+3zxpfxM1yFao+A== =lf3x -----END PGP SIGNATURE----- --iy6nspqtdtxt6xyd--