linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Ellerman <mpe@ellerman.id.au>
To: minyard@acm.org
Cc: openipmi-developer@lists.sourceforge.net,
	linuxppc-dev@lists.ozlabs.org, Jeremy Kerr <jk@ozlabs.org>
Subject: Re: [PATCH 0/2] Add IPMI support for powernv powerpc machines
Date: Wed, 12 Nov 2014 17:10:36 +1100	[thread overview]
Message-ID: <1415772636.10731.6.camel@concordia> (raw)
In-Reply-To: <545B826F.7050501@acm.org>

On Thu, 2014-11-06 at 08:15 -0600, Corey Minyard wrote:
> On 11/05/2014 09:38 PM, Jeremy Kerr wrote:
> > Corey & Michael: if this is acceptable, it may be mergable as two
> > separate patches - one for the IPMI subsystem, one for the powernv
> > platform.  However, we'd need to preserve their order: patch 2/2 depends
> > on 1/2, which provides the structure & function definitions. This'll
> > break the build if only 2/2 is in the tree, and CONFIG_IPMI_POWERNV is
> > set.
> >
> > Alternatively, they could be merged by one maintainer, pending an ack
> > from the other.
> 
> I'm fine either way.

How about the third option? :)

I've put patch 1 in a topic branch:

  https://git.kernel.org/cgit/linux/kernel/git/mpe/linux.git/log/?h=topic/opal-ipmi

And will merge that into my next, probably by tomorrow.

If you merge the topic branch and then apply patch 2/2, then it should all go
in without any hiccups.

cheers

  parent reply	other threads:[~2014-11-12  6:10 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-06  3:38 [PATCH 0/2] Add IPMI support for powernv powerpc machines Jeremy Kerr
2014-11-06  3:38 ` [PATCH 1/2] powerpc/powernv: Add OPAL IPMI interface Jeremy Kerr
2014-11-06  3:38 ` [PATCH 2/2] drivers/char/ipmi: Add powernv IPMI driver Jeremy Kerr
2014-11-06 14:15 ` [PATCH 0/2] Add IPMI support for powernv powerpc machines Corey Minyard
2014-11-10  3:26   ` Jeremy Kerr
2014-11-10  5:41     ` Benjamin Herrenschmidt
2014-11-10  6:01       ` Alistair Popple
2014-11-10  6:57         ` Benjamin Herrenschmidt
2014-11-10  6:41       ` Jeremy Kerr
2014-11-11 21:07     ` Corey Minyard
2014-11-12  6:10   ` Michael Ellerman [this message]
2014-11-12  7:37     ` Jeremy Kerr
2014-11-12  7:41     ` [PATCH v2] drivers/char/ipmi: Add powernv IPMI driver Jeremy Kerr
2014-11-14  1:42       ` Corey Minyard
2014-11-14  2:00         ` Jeremy Kerr
2014-11-14  2:04         ` Michael Ellerman

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=1415772636.10731.6.camel@concordia \
    --to=mpe@ellerman.id.au \
    --cc=jk@ozlabs.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=minyard@acm.org \
    --cc=openipmi-developer@lists.sourceforge.net \
    /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).