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

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

Previous thread: linux-next: manual merge of the vfs-scale tree with the v9fs tree by Stephen Rothwell on Monday, January 3, 2011 - 6:40 pm. (3 messages)

Next thread: linux-next: manual merge of the net tree with the pci tree by Stephen Rothwell on Monday, January 3, 2011 - 7:28 pm. (1 message)
[view original message]
From: Stephen Rothwell
Subject: linux-next: manual merge of the net tree with the 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/sky2.c between
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.
-- 
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 vfs-scale tree with the v9fs tree by Stephen Rothwell on Monday, January 3, 2011 - 6:40 pm. (3 messages)

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