* linux-next: manual merge of the ipmi tree with Linus' tree
@ 2017-11-27 0:28 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2017-11-27 0:28 UTC (permalink / raw)
To: Corey Minyard
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook,
Masamitsu Yamazaki
Hi Corey,
Today's linux-next merge of the ipmi tree got a conflict in:
drivers/char/ipmi/ipmi_si_intf.c
between commit:
e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")
from Linus' tree and commit:
942e1563654c ("ipmi: Stop timers before cleaning up the module")
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_si_intf.c
index 779869ed32b1,99b0513bb55b..000000000000
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@@ -1166,7 -1165,8 +1165,8 @@@ static int smi_start_processing(voi
new_smi->intf = intf;
/* Set up the timer that drives the interface. */
- setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);
+ timer_setup(&new_smi->si_timer, smi_timeout, 0);
+ new_smi->timer_can_start = true;
smi_mod_timer(new_smi, jiffies + SI_TIMEOUT_JIFFIES);
/* Try to claim any interrupts. */
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the ipmi tree with Linus' tree
@ 2025-05-02 6:06 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-02 6:06 UTC (permalink / raw)
To: Corey Minyard
Cc: Corey Minyard, Ingo Molnar, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Gleixner
[-- Attachment #1: Type: text/plain, Size: 1978 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-05-02 6:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-27 0:28 linux-next: manual merge of the ipmi tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-02 6:06 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox