Home » Mailing list archives » linux-kernel » 2011 » January » 4

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

Previous thread: linux-next: manual merge of the net tree with the tree by Stephen Rothwell on Monday, January 3, 2011 - 7:28 pm. (1 message)

Next thread: linux-next: manual merge of the trivial tree with the net tree by Stephen Rothwell on Monday, January 3, 2011 - 8:22 pm. (1 message)
[view original message]
From: Stephen Rothwell
Subject: linux-next: manual merge of the net tree with the pci tree
Date: Monday, January 3, 2011 - 7:28 pm

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/

[ message continues ]
Previous thread: linux-next: manual merge of the net tree with the tree by Stephen Rothwell on Monday, January 3, 2011 - 7:28 pm. (1 message)

Next thread: linux-next: manual merge of the trivial tree with the net tree by Stephen Rothwell on Monday, January 3, 2011 - 8:22 pm. (1 message)