From mboxrd@z Thu Jan 1 00:00:00 1970 From: Corey Minyard Subject: Re: linux-next: manual merge of the ipmi tree with the modules tree Date: Thu, 2 Nov 2017 11:40:52 -0500 Message-ID: <6646da34-6d1e-687d-52e9-b7d65259ce4b@acm.org> References: <20171102145808.5bb97c3a@canb.auug.org.au> <16c92e03-98b8-3121-cdd8-2e6371451724@acm.org> <20171102142722.xletcv3hip3x7qmc@redbean> Reply-To: minyard@acm.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Return-path: Received: from mail-oi0-f52.google.com ([209.85.218.52]:55217 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933488AbdKBQk4 (ORCPT ); Thu, 2 Nov 2017 12:40:56 -0400 In-Reply-To: <20171102142722.xletcv3hip3x7qmc@redbean> Content-Language: en-GB Sender: linux-next-owner@vger.kernel.org List-ID: To: Jessica Yu Cc: Corey Minyard , Kees Cook , Stephen Rothwell , Linux-Next Mailing List , Linux Kernel Mailing List 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 > Thanks, > > Jessica