* linux-next: pci merge conflict
@ 2008-06-11 3:23 Stephen Rothwell
2008-06-11 3:38 ` Alex Chiang
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-06-11 3:23 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, Greg KH, Kay Sievers, Alex Chiang
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
drivers/pci/hotplug/fakephp.c between commit
b9a4a152420e0158822ffb0cf0e57d36019604c7 ("driver-core: prepare for
removal of 20 char limit from struct device") from the driver-core tree
and commit fe99740cac117f208707488c03f3789cf4904957 ("PCI: construct one
fakephp slot per PCI slot") from the pci tree.
I did what seemed to be the right thing - it seems that the driver-core
patch to this file is no longer needed. It is worth a check.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-06-11 3:23 linux-next: pci merge conflict Stephen Rothwell
@ 2008-06-11 3:38 ` Alex Chiang
0 siblings, 0 replies; 9+ messages in thread
From: Alex Chiang @ 2008-06-11 3:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jesse Barnes, linux-next, Greg KH, Kay Sievers
* Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/hotplug/fakephp.c between commit
> b9a4a152420e0158822ffb0cf0e57d36019604c7 ("driver-core: prepare for
> removal of 20 char limit from struct device") from the driver-core tree
> and commit fe99740cac117f208707488c03f3789cf4904957 ("PCI: construct one
> fakephp slot per PCI slot") from the pci tree.
>
> I did what seemed to be the right thing - it seems that the driver-core
> patch to this file is no longer needed. It is worth a check.
Yes, I mentioned the possibility of this conflict here:
http://lkml.org/lkml/2008/6/10/382
And yes, dropping the driver-core hunk is the correct thing to
do.
Thanks Stephen!
/ac
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: pci merge conflict
@ 2008-05-28 2:27 Stephen Rothwell
2008-05-28 2:50 ` Kenji Kaneshige
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-05-28 2:27 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, Kenji Kaneshige
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-05-28 2:27 Stephen Rothwell
@ 2008-05-28 2:50 ` Kenji Kaneshige
2008-05-28 3:19 ` Stephen Rothwell
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Kenji Kaneshige @ 2008-05-28 2:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jesse Barnes, linux-next
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.
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-05-28 2:50 ` Kenji Kaneshige
@ 2008-05-28 3:19 ` Stephen Rothwell
2008-05-28 4:04 ` Jesse Barnes
2008-05-28 4:08 ` Jesse Barnes
2 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2008-05-28 3:19 UTC (permalink / raw)
To: Kenji Kaneshige; +Cc: Jesse Barnes, linux-next
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
Hi Kenji,
On Wed, 28 May 2008 11:50:27 +0900 Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> wrote:
>
> I have already have updated patches. I'll send them if necessary.
That would be good for tomorrow as the pci-current tree has now gone into
Linus' tree.
Thanks
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-05-28 2:50 ` Kenji Kaneshige
2008-05-28 3:19 ` Stephen Rothwell
@ 2008-05-28 4:04 ` Jesse Barnes
2008-05-28 4:08 ` Jesse Barnes
2 siblings, 0 replies; 9+ messages in thread
From: Jesse Barnes @ 2008-05-28 4:04 UTC (permalink / raw)
To: Kenji Kaneshige; +Cc: Stephen Rothwell, linux-next
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-05-28 2:50 ` Kenji Kaneshige
2008-05-28 3:19 ` Stephen Rothwell
2008-05-28 4:04 ` Jesse Barnes
@ 2008-05-28 4:08 ` Jesse Barnes
2008-05-28 5:53 ` Kenji Kaneshige
2 siblings, 1 reply; 9+ messages in thread
From: Jesse Barnes @ 2008-05-28 4:08 UTC (permalink / raw)
To: Kenji Kaneshige; +Cc: Stephen Rothwell, linux-next
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.
Oops, meant to actually write a message. :)
I'll merge the Linus tree into linux-next tomorrow. Kenji-san, I'll probably
ask for updated patches then for anything that's in linux-next but not in
Linus' tree yet.
Thanks,
Jesse
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-05-28 4:08 ` Jesse Barnes
@ 2008-05-28 5:53 ` Kenji Kaneshige
2008-05-28 17:57 ` Jesse Barnes
0 siblings, 1 reply; 9+ messages in thread
From: Kenji Kaneshige @ 2008-05-28 5:53 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Stephen Rothwell, linux-next
Jesse Barnes wrote:
> 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.
>
> Oops, meant to actually write a message. :)
>
> I'll merge the Linus tree into linux-next tomorrow. Kenji-san, I'll probably
> ask for updated patches then for anything that's in linux-next but not in
> Linus' tree yet.
>
Ok, just in case, I send patches related to pciehp now. I'll send the flowing
patches followed by this e-mail.
- [PATCH 1/4] Updated version of 72c4928058175e889b2f83d1a62ac6f2eb0498a0
- [PATCH 2/4] Updated version of 4c8cc2d54b1d35cf24ede6057e05f103cfa28852
- [PATCH 3/4] Updated version of 2b26196717939221ccc06073780b73d0f4ee3203
- [PATCH 4/4] Updated version of 9d06d9963852e7818157994c645c640239cb5137
I made these patches against 2.6.24-rc4 with recent pciehp regression fixes
applied.
Thanks,
Kenji Kaneshige
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: pci merge conflict
2008-05-28 5:53 ` Kenji Kaneshige
@ 2008-05-28 17:57 ` Jesse Barnes
0 siblings, 0 replies; 9+ messages in thread
From: Jesse Barnes @ 2008-05-28 17:57 UTC (permalink / raw)
To: Kenji Kaneshige; +Cc: Stephen Rothwell, linux-next
On Tuesday, May 27, 2008 10:53 pm Kenji Kaneshige wrote:
> Jesse Barnes wrote:
> > 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.
> >
> > Oops, meant to actually write a message. :)
> >
> > I'll merge the Linus tree into linux-next tomorrow. Kenji-san, I'll
> > probably ask for updated patches then for anything that's in linux-next
> > but not in Linus' tree yet.
>
> Ok, just in case, I send patches related to pciehp now. I'll send the
> flowing patches followed by this e-mail.
>
> - [PATCH 1/4] Updated version of 72c4928058175e889b2f83d1a62ac6f2eb0498a0
> - [PATCH 2/4] Updated version of 4c8cc2d54b1d35cf24ede6057e05f103cfa28852
> - [PATCH 3/4] Updated version of 2b26196717939221ccc06073780b73d0f4ee3203
> - [PATCH 4/4] Updated version of 9d06d9963852e7818157994c645c640239cb5137
>
> I made these patches against 2.6.24-rc4 with recent pciehp regression fixes
> applied.
Great, thanks a lot. I just pushed these into linux-next, please verify
things when you get a chance.
Thanks,
Jesse
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-06-11 3:38 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-11 3:23 linux-next: pci merge conflict Stephen Rothwell
2008-06-11 3:38 ` Alex Chiang
-- strict thread matches above, loose matches on Subject: below --
2008-05-28 2:27 Stephen Rothwell
2008-05-28 2:50 ` Kenji Kaneshige
2008-05-28 3:19 ` Stephen Rothwell
2008-05-28 4:04 ` Jesse Barnes
2008-05-28 4:08 ` Jesse Barnes
2008-05-28 5:53 ` Kenji Kaneshige
2008-05-28 17:57 ` Jesse Barnes
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).