linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: pci merge conflict
@ 2008-05-28  2:27 Stephen Rothwell
  2008-05-28  2:50 ` Kenji Kaneshige
  0 siblings, 1 reply; 13+ 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] 13+ messages in thread
* linux-next: pci merge conflict
@ 2008-06-11  3:23 Stephen Rothwell
  2008-06-11  3:38 ` Alex Chiang
  0 siblings, 1 reply; 13+ 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] 13+ messages in thread

end of thread, other threads:[~2008-06-11  3:38 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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

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).