linux-next: manual merge of the ipmi tree with the i2c tree

[Stephen Rothwell]

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_remove_callback_void-immutable"

-- 
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 = NULL;
  	iidev->client = NULL;
  	ipmi_ipmb_stop_thread(iidev);
+ }
+ 
 -static int ipmi_ipmb_remove(struct i2c_client *client)
++static void ipmi_ipmb_remove(struct i2c_client *client)
+ {
+ 	struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);
  
+ 	ipmi_ipmb_cleanup(iidev);
  	ipmi_unregister_smi(iidev->intf);
 -
 -	return 0;
  }
  
  static int ipmi_ipmb_probe(struct i2c_client *client)

Attachment: pgpnSqVeQmszG.pgp
Description: OpenPGP digital signature