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

From: Jessica Yu
Date: Thu Nov 02 2017 - 12:58:24 EST


+++ 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 commit:

  e4dca7b7aa08 ("treewide: Fix function prototypes for module_param_call()")

from the modules tree and commit:

  44814ec982d2 ("ipmi_si: Move the hotmod handling to another file.")

from the ipmi tree.

Thanks Stephen.

Kees, do you have a tree I can merge so we can avoid this going upstream?

Hi Corey,

the modules-next tree (with the conflicting commit) is found here:
git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next


Hi Jessica,

I merged this into the ipmi for-next tree, so we should be good now,
assuming I did this right.

Thanks Corey!

Jessica