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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Mon, 27 Nov 2017 11:28:25 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Corey Minyard <cminyard@...sta.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kees Cook <keescook@...omium.org>,
        Masamitsu Yamazaki <m-yamazaki@...jp.nec.com>
Subject: linux-next: manual merge of the ipmi tree with Linus' tree

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. */