linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jessica Yu <jeyu@kernel.org>
To: Corey Minyard <minyard@acm.org>
Cc: Corey Minyard <cminyard@mvista.com>,
	Kees Cook <keescook@chromium.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ipmi tree with the modules tree
Date: Thu, 2 Nov 2017 15:27:23 +0100	[thread overview]
Message-ID: <20171102142722.xletcv3hip3x7qmc@redbean> (raw)
In-Reply-To: <16c92e03-98b8-3121-cdd8-2e6371451724@acm.org>

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

Thanks,

Jessica 

  reply	other threads:[~2017-11-02 14:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-02  3:58 linux-next: manual merge of the ipmi tree with the modules tree Stephen Rothwell
2017-11-02 13:31 ` Corey Minyard
2017-11-02 14:27   ` Jessica Yu [this message]
2017-11-02 16:40     ` Corey Minyard
2017-11-02 16:58       ` Jessica Yu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171102142722.xletcv3hip3x7qmc@redbean \
    --to=jeyu@kernel.org \
    --cc=cminyard@mvista.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=minyard@acm.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).