Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 23 Sep 2022 14:37:25 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Corey Minyard <cminyard@mvista.com>,
        Wolfram Sang <wsa@the-dreams.de>
Cc:     Corey Minyard <minyard@acm.org>,
        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>, Wolfram Sang <wsa@kernel.org>
Subject: linux-next: manual merge of the ipmi tree with the i2c tree
Message-ID: <20220923143725.0641ee4f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_//tpbQMaQotCsAyBILEyG5e3";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/char/ipmi/ipmi_ipmb.c

between commit:

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the i2c tree and commit:

  80d98a33008c ("ipmi:ipmb: Don't call ipmi_unregister_smi() on a register =
failure")

from the ipmi 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.

Also, from Uwe:

"There is an immutable tag that can be merged into your tree to
resolve the conflict before you send your changes to Linux at

	https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_rem=
ove_callback_void-immutable"

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/char/ipmi/ipmi_ipmb.c
index 25c010c9ec25,740dc0f824e0..000000000000
--- a/drivers/char/ipmi/ipmi_ipmb.c
+++ b/drivers/char/ipmi/ipmi_ipmb.c
@@@ -436,8 -434,16 +434,14 @@@ static void ipmi_ipmb_cleanup(struct ip
  	iidev->slave =3D NULL;
  	iidev->client =3D NULL;
  	ipmi_ipmb_stop_thread(iidev);
+ }
+=20
 -static int ipmi_ipmb_remove(struct i2c_client *client)
++static void ipmi_ipmb_remove(struct i2c_client *client)
+ {
+ 	struct ipmi_ipmb_dev *iidev =3D i2c_get_clientdata(client);
 =20
+ 	ipmi_ipmb_cleanup(iidev);
  	ipmi_unregister_smi(iidev->intf);
 -
 -	return 0;
  }
 =20
  static int ipmi_ipmb_probe(struct i2c_client *client)

--Sig_//tpbQMaQotCsAyBILEyG5e3
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMtOAUACgkQAVBC80lX
0GwluQgApUUUI8r+mZFQ3RHr5guB1j0F9VPrsbuevJTX77cxvIk5ucVHNUm7Iyin
M35smueQxpKjeCGoJNOu+6cnBpG6/ZLy3wNlWr3MVoeXwXXUIIW3b4Ydpk1uB7tf
tcnncerI+rMDGCXvuFv/n2+NKs1vmMdiy+D0MinlbPSi03TJ0kQVoUF/p0PYM99N
T1T9MvzfaPi4i8vxMw4b7svsdacKbBCUbiv/NW9I5cgudJrJVi/KZ9b0exNe/3OQ
TrAKQplZo5olCKVvKKX8MrImL9JdmPjSo+RclPzUFm5hA5V+rhjS41jjOO0ffdRg
QEbuxrIkxSz7E9XJQ/WOQ+TapFCooQ==
=foYZ
-----END PGP SIGNATURE-----

--Sig_//tpbQMaQotCsAyBILEyG5e3--