Received-SPF: pass (google.com: domain of linux-kernel+bounces-210959-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 12 Jun 2024 08:07:39 +0200
From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <u.kleine-koenig@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Andrew Morton <akpm@linux-foundation.org>, 
	Christophe JAILLET <christophe.jaillet@wanadoo.fr>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the mm tree
Message-ID: <7c6mpxaxilnh624zt2ifmxttfp62yyaj3zhwfdka3rdpeuwvow@p5ezripyv7xu>
References: <20240612123640.68ae0310@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="dcjyokx52cz535jr"
Content-Disposition: inline
In-Reply-To: <20240612123640.68ae0310@canb.auug.org.au>


--dcjyokx52cz535jr
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello Stephen,

On Wed, Jun 12, 2024 at 12:36:40PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the driver-core tree got a conflict in:
>=20
>   drivers/fsi/fsi-occ.c
>=20
> between commit:
>=20
>   2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx()=
 API")
>=20
> from the mm-nonmm-unstable branch of the mm tree and commit:
>=20
>   29f102dbb11f ("fsi: occ: Convert to platform remove callback returning =
void")
>=20
> from the driver-core tree.
>=20
> I fixed it up (see below) and can carry the fix as necessary. This
> [...]
>=20
> diff --cc drivers/fsi/fsi-occ.c
> index f7157c1d77d8,21d2666c4195..000000000000
> --- a/drivers/fsi/fsi-occ.c
> +++ b/drivers/fsi/fsi-occ.c
> @@@ -718,9 -719,7 +718,7 @@@ static void occ_remove(struct platform_
>   	else
>   		device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
>  =20
>  -	ida_simple_remove(&occ_ida, occ->idx);
>  +	ida_free(&occ_ida, occ->idx);
> -=20
> - 	return 0;
>   }
>  =20
>   static const struct of_device_id occ_match[] =3D {

that looks correct to me. Thanks for caring!

Best regards
Uwe

--dcjyokx52cz535jr
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmZpOycACgkQj4D7WH0S
/k4qPggAhsqkKKxocPwhpTL12fU5huAgcoPVsUw13zC2ntWLxJt2xMXnBFCrch2+
ihKdQIPK0otifGpFj3PhmpSQCxAFGj9q9w3VMW3nEiYL4dEN9jMlLrZeHYsikvKR
Et4g6NuuhyV75b1ko4mCWMBE+nx5qybvvbYSWjOoxIPVdueYCJoqacCi/m6mWIOH
2VTYx3YTEmC0F2wlZDhUwKyDkymnyq3NbgUZEjtLm3kKxgdgFAFMGoGXKLVCgqkS
FLyaCNzmR25F7NWjIq33o5FtBYA6YVaadB2hXgq2j8hAFEaR6Kghdv1LS/cDSLyz
VC1aUvXZUM+65Nu4tjq7l57fn0IFbw==
=ujHZ
-----END PGP SIGNATURE-----

--dcjyokx52cz535jr--