* linux-next: manual merge of the net tree with the pci tree
@ 2011-01-04 2:28 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-01-04 2:28 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Jon Mason, Jesse Barnes, stephen hemminger
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/skge.c between commit
1d3c16a818e992c199844954d95c17fd7ce6cbba ("PCI: make pci_restore_state
return void") from the pci tree and commit
7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2 ("skge: Do not use legacy PCI
power management") from the net tree.
The latter removes the code modified by the former, so I used the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-04 2:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-04 2:28 linux-next: manual merge of the net tree with the pci tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®