# linux-next: manual merge of the net tree with the pci tree

- From: Stephen Rothwell \<hidden\>
- Date: 2011-01-04 02:29:07 
- List: netdev
- Page: https://ratatoskr.run/netdev/2011/01/3661184
- Thread: https://ratatoskr.run/netdev/2011/01/3661184/t.md

```text
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/
```

## Attachments

- [(unnamed)](https://ratatoskr.run/netdev/2011/01/3661184/attachment/0) (application/pgp-signature, 490 bytes)