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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 2 Nov 2017 11:40:52 -0500
From:   Corey Minyard <minyard@....org>
To:     Jessica Yu <jeyu@...nel.org>
Cc:     Corey Minyard <cminyard@...sta.com>,
        Kees Cook <keescook@...omium.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the ipmi tree with the modules tree

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 


Powered by blists - more mailing lists