From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org
Subject: Re: linux-next: pci merge conflict
Date: Tue, 27 May 2008 21:04:28 -0700 [thread overview]
Message-ID: <200805272104.28178.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <483CC873.5000300@jp.fujitsu.com>
On Tuesday, May 27, 2008 7:50 pm Kenji Kaneshige wrote:
> Hi Stephen-san, Jesse-san,
>
> I have already have updated patches. I'll send them if necessary.
>
> Thanks,
> Kenji Kaneshige
>
> Stephen Rothwell wrote:
> > Hi Jesse,
> >
> > Today's linux-next mege of the pci tree got conflicts in
> > drivers/pci/hotplug/pciehp_hpc.c between commits
> > 5808639bfa98d69f77a481d759570d85f164fea0 ("pciehp: fix slow probing") and
> > 6592e02ae4bd7b277230aa0c5821588a13b9d8e3 ("pciehp: poll cmd completion if
> > hotplug interrupt is disabled") from the pci-current tree and commit
> > 2b26196717939221ccc06073780b73d0f4ee3203 ("pciehp: fix waiting
> > command"). I fixed it up as best I can, but please have a look.
next prev parent reply other threads:[~2008-05-28 4:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-28 2:27 linux-next: pci merge conflict Stephen Rothwell
2008-05-28 2:50 ` Kenji Kaneshige
2008-05-28 3:19 ` Stephen Rothwell
2008-05-28 4:04 ` Jesse Barnes [this message]
2008-05-28 4:08 ` Jesse Barnes
2008-05-28 5:53 ` Kenji Kaneshige
2008-05-28 5:56 ` [PATCH 1/4] Updated version of 72c4928058175e889b2f83d1a62ac6f2eb0498a0 Kenji Kaneshige
2008-05-28 5:57 ` [PATCH 2/4] Updated version of 4c8cc2d54b1d35cf24ede6057e05f103cfa28852 Kenji Kaneshige
2008-05-28 5:59 ` [PATCH 3/4] Updated version of 2b26196717939221ccc06073780b73d0f4ee3203 Kenji Kaneshige
2008-05-28 6:01 ` [PATCH 4/4] Updated version of 9d06d9963852e7818157994c645c640239cb5137 Kenji Kaneshige
2008-05-28 17:57 ` linux-next: pci merge conflict Jesse Barnes
2008-06-11 3:23 Stephen Rothwell
2008-06-11 3:38 ` Alex Chiang
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=200805272104.28178.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek.org \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-next@vger.kernel.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).