Received-SPF: pass (google.com: domain of linux-kernel+bounces-210838-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 12 Jun 2024 12:36:40 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Andrew Morton <akpm@linux-foundation.org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>, Linux Kernel Mailing
 List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?=
 <u.kleine-koenig@pengutronix.de>
Subject: linux-next: manual merge of the driver-core tree with the mm tree
Message-ID: <20240612123640.68ae0310@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/NXGv7YrK=2nxl_57utSjCDV";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/NXGv7YrK=2nxl_57utSjCDV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/fsi/fsi-occ.c

between commit:

  2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx() A=
PI")

from the mm-nonmm-unstable branch of the mm tree and commit:

  29f102dbb11f ("fsi: occ: Convert to platform remove callback returning vo=
id")

from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

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 {

--Sig_/NXGv7YrK=2nxl_57utSjCDV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZpCbgACgkQAVBC80lX
0GxVHQgAogcMO90jU47ZoQmSJulLfzunOkza2dlL3ZHjbJO3e2SO1LeKswN19IHb
sbAAIcpb6ZB86vDf+exLjkXmz5s+eZi38mntFWivvLvqAqdrl1hZOFoZvTDc7dpQ
KRuTedv+mclaDxfxH/8wY9Z3andvEWQa9MmBhHpGpEKcrdhWVGegm9ts+1McFfL5
niC2i2/8nO1AHFto3m90ErEdtpSm2tHUgJK5owNLZaJWDmhIkjEH4O/V23j7oWgi
x0TiaW4KJIKrRCP+U2iJT0cQB9khEUgjlZdYtLKDDOR/0KWDI5Exu+5e2Mw93Wjy
c+xsQSt9un3ZQJxuWw324GQuxQsr3A==
=LhxS
-----END PGP SIGNATURE-----

--Sig_/NXGv7YrK=2nxl_57utSjCDV--