Today's linux-next merge of the net tree got a conflict in
commit1d3c16a818e992c199844954d95c17fd7ce6cbba ("PCI: make
pci_restore_state return void") from the tree and commit
0f333d10e3f689640b229c8cf00b16ea51ce4951 ("sky2: Do not use legacy PCI
power management") from the net tree.
The latter removes the code that the former modifies. I used the latter.
Stephen Rothwell email@example.com://www.canb.auug.org.au/~sfr/