Re: linux-next: manual merge of the ipmi tree with the modules tree

2017-11-02 Thread Jessica Yu
+++ Corey Minyard [02/11/17 11:40 -0500]: On 11/02/2017 09:27 AM, Jessica Yu wrote: +++ Corey Minyard [02/11/17 08:31 -0500]: On 11/01/2017 10:58 PM, Stephen Rothwell wrote: Hi Corey, Today's linux-next merge of the ipmi tree got a conflict in:   drivers/char/ipmi/ipmi_si_intf.c between com

Re: linux-next: manual merge of the ipmi tree with the modules tree

2017-11-02 Thread Corey Minyard
On 11/02/2017 09:27 AM, Jessica Yu wrote: +++ Corey Minyard [02/11/17 08:31 -0500]: On 11/01/2017 10:58 PM, Stephen Rothwell wrote: Hi Corey, Today's linux-next merge of the ipmi tree got a conflict in:   drivers/char/ipmi/ipmi_si_intf.c between commit:   e4dca7b7aa08 ("treewide: Fix functi

Re: linux-next: manual merge of the ipmi tree with the modules tree

2017-11-02 Thread Jessica Yu
+++ Corey Minyard [02/11/17 08:31 -0500]: On 11/01/2017 10:58 PM, Stephen Rothwell wrote: Hi Corey, Today's linux-next merge of the ipmi tree got a conflict in: drivers/char/ipmi/ipmi_si_intf.c between commit: e4dca7b7aa08 ("treewide: Fix function prototypes for module_param_call()") fr

Re: linux-next: manual merge of the ipmi tree with the modules tree

2017-11-02 Thread Corey Minyard
On 11/01/2017 10:58 PM, Stephen Rothwell wrote: Hi Corey, Today's linux-next merge of the ipmi tree got a conflict in: drivers/char/ipmi/ipmi_si_intf.c between commit: e4dca7b7aa08 ("treewide: Fix function prototypes for module_param_call()") from the modules tree and commit: 44814

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

2017-11-01 Thread Stephen Rothwell
Hi Corey, Today's linux-next merge of the ipmi tree got a conflict in: drivers/char/ipmi/ipmi_si_intf.c between commit: e4dca7b7aa08 ("treewide: Fix function prototypes for module_param_call()") from the modules tree and commit: 44814ec982d2 ("ipmi_si: Move the hotmod handling to anothe