From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Corey Minyard <cminyard@mvista•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kees Cook <keescook@chromium•org>,
Masamitsu Yamazaki <m-yamazaki@ah•jp.nec.com>
Subject: linux-next: manual merge of the ipmi tree with Linus' tree
Date: Mon, 27 Nov 2017 11:28:25 +1100 [thread overview]
Message-ID: <20171127112825.0a597b6a@canb.auug.org.au> (raw)
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. */
next reply other threads:[~2017-11-27 0:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-27 0:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-02 6:06 linux-next: manual merge of the ipmi tree with Linus' tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171127112825.0a597b6a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cminyard@mvista$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m-yamazaki@ah$(echo .)jp.nec.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox