From: Michael Ellerman <mpe@ellerman.id.au>
To: Corey Minyard <cminyard@mvista.com>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
"Tony Rex" <tony.rex@ericsson.com>,
"Magnus Johansson E" <magnus.e.johansson@ericsson.com>,
"Per Fogelström" <per.fogelstrom@ericsson.com>,
"Jeremy Kerr" <jk@ozlabs.org>, Sanjeev <singhsan@codeaurora.org>,
"Thomas Renninger" <trenn@suse.de>,
"openipmi-developer@lists.sourceforge.net"
<openipmi-developer@lists.sourceforge.net>
Subject: Re: [GIT PULL] ipmi driver updates
Date: Wed, 10 Dec 2014 21:53:04 +1100 [thread overview]
Message-ID: <1418208784.9279.11.camel@ellerman.id.au> (raw)
In-Reply-To: <54873864.3050606@mvista.com>
Hi Corey,
On Tue, 2014-12-09 at 11:59 -0600, Corey Minyard wrote:
> Jeremy Kerr (2):
> powerpc/powernv: Add OPAL IPMI interface
> drivers/char/ipmi: Add powernv IPMI driver
I created a topic branch for that powerpc patch, but it looks like you didn't
merge it?
https://git.kernel.org/cgit/linux/kernel/git/mpe/linux.git/log/?h=topic/opal-ipmi
The merge conflict between your tree and mine is not all that pretty, though
Linus should be able to work it out. I haven't sent my pull request yet though,
so he'll probably get it when he merges my tree.
The patch in your tree does look correct, so that's OK, but maybe next time we
can both merge the topic branch.
cheers
next prev parent reply other threads:[~2014-12-10 10:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-09 17:59 Corey Minyard
2014-12-10 10:53 ` Michael Ellerman [this message]
2014-12-10 14:21 ` Corey Minyard
2014-12-11 5:58 ` Michael Ellerman
2014-12-11 20:19 ` Linus Torvalds
2014-12-11 22:36 ` Corey Minyard
2014-12-11 22:40 ` Linus Torvalds
2014-12-11 22:59 ` Corey Minyard
2014-12-11 23:33 ` Michael Ellerman
2014-12-12 13:51 ` Signed tag docs (was [GIT PULL] ipmi driver updates) Jonathan Corbet
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=1418208784.9279.11.camel@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=cminyard@mvista.com \
--cc=jk@ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=magnus.e.johansson@ericsson.com \
--cc=openipmi-developer@lists.sourceforge.net \
--cc=per.fogelstrom@ericsson.com \
--cc=singhsan@codeaurora.org \
--cc=tony.rex@ericsson.com \
--cc=torvalds@linux-foundation.org \
--cc=trenn@suse.de \
/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
all inboxes | Powered by JetHome®