linux-next: manual merge of the ipmi tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/char/ipmi/ipmi_msghandler.c
  drivers/char/ipmi/ipmi_ssif.c

between commit:

  8fa7292fee5c ("treewide: Switch/rename to timer_delete[_sync]()")

from Linus' tree and commits:

  7b1ee7900db5 ("ipmi:msghandler: Move timer handling into a work queue")
  55c5befa949a ("ipmi:ssif: Fix a shutdown race")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/char/ipmi/ipmi_msghandler.c
index 3ba9d7e9a6c7,ece6aa95fbb5..000000000000
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@@ -5538,7 -5577,8 +5577,8 @@@ static void __exit cleanup_ipmi(void
  		 * here.
  		 */
  		atomic_set(&stop_operation, 1);
 -		del_timer_sync(&ipmi_timer);
 +		timer_delete_sync(&ipmi_timer);
+ 		cancel_work_sync(&ipmi_timer_work);
  
  		initialized = false;
  
diff --cc drivers/char/ipmi/ipmi_ssif.c
index 0b45b07dec22,b016fabaac68..000000000000
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@@ -1268,12 -1266,10 +1266,10 @@@ static void shutdown_ssif(void *send_in
  		schedule_timeout(1);
  
  	ssif_info->stopping = true;
 -	del_timer_sync(&ssif_info->watch_timer);
 -	del_timer_sync(&ssif_info->retry_timer);
 +	timer_delete_sync(&ssif_info->watch_timer);
 +	timer_delete_sync(&ssif_info->retry_timer);
- 	if (ssif_info->thread) {
- 		complete(&ssif_info->wake_thread);
+ 	if (ssif_info->thread)
  		kthread_stop(ssif_info->thread);
- 	}
  }
  
  static void ssif_remove(struct i2c_client *client)

Attachment: pgpXQJIpSHapU.pgp
Description: OpenPGP digital signature