All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kristen Accardi <kristen.c.accardi@intel.com>
To: Greg KH <greg@kroah.com>
Cc: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>,
	pavel@ucw.cz, pcihpd-discuss@lists.sourceforge.net,
	linux-acpi@vger.kernel.org, len.brown@intel.com
Subject: Re: [Pcihpd-discuss] Re: [PATCH 0/7] acpiphp - slots management fix
Date: Fri, 10 Feb 2006 11:28:24 -0800	[thread overview]
Message-ID: <1139599704.26632.53.camel@whizzy> (raw)
In-Reply-To: <20060207201304.GA18648@kroah.com>

On Tue, 2006-02-07 at 12:13 -0800, Greg KH wrote:
> On Tue, Jan 31, 2006 at 10:20:18AM -0800, Kristen Accardi wrote:
> > Just reviewing them, they seem like they will be fine to me.
> 
> This conflicts with your other patch you sent me.  I'll keep yours, and
> drop this one, and let you merge his in with yours.
> 
> Is that ok?
> 
> thanks,
> 
> greg k-h

I tried to merge this in against 2.6.16-rc2-mm1, which contains the
patch you kept, and there are compile issues in his patch still.  I
think it would be best if Muneda merged these himself.

Kristen



  reply	other threads:[~2006-02-10 19:24 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-20 10:08 [PATCH 0/7] acpiphp - slots management fix MUNEDA Takahiro
2006-01-20 11:30 ` Pavel Machek
2006-01-23  0:37   ` [Pcihpd-discuss] " MUNEDA Takahiro
2006-01-27  4:14 ` Greg KH
2006-01-29  3:34   ` [Pcihpd-discuss] " MUNEDA Takahiro
2006-01-29  3:45     ` Greg KH
2006-01-31 18:20       ` Kristen Accardi
2006-02-07 20:13         ` Greg KH
2006-02-10 19:28           ` Kristen Accardi [this message]
2006-02-13  2:27             ` MUNEDA Takahiro
2006-02-14  7:13               ` [PATCH] acpiphp - slot management fix - V2 MUNEDA Takahiro
2006-02-14  9:17                 ` [Pcihpd-discuss] " Kenji Kaneshige
2006-02-15  9:26                   ` [PATCH] acpiphp - slot management fix - V3 MUNEDA Takahiro

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=1139599704.26632.53.camel@whizzy \
    --to=kristen.c.accardi@intel.com \
    --cc=greg@kroah.com \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=muneda.takahiro@jp.fujitsu.com \
    --cc=pavel@ucw.cz \
    --cc=pcihpd-discuss@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.