>-----Original Message----- >From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] >Sent: Sunday, March 15, 2009 10:05 PM >To: David Miller >Cc: linux-next@xxxxxxxxxxxxxxx; Duyck, Alexander H; Kirsher, Jeffrey T >Subject: linux-next: manual merge of the net tree with the net-current tree > >Hi David, > >Today's linux-next merge of the net tree got a conflict in >drivers/net/igb/igb_main.c between commit >682337fe062e939578d933c74157ae9a36baa4ce ("igb: remove ASPM L0s >workaround") from the net-current tree and commits >aed5dec370e294233d647251ce1e5f74d70b09c9 ("igb: remove check for needing >an io port") and 450c87c8d28aeaf83889389ceeb01457c1a6f3e9 ("igb: remove >redundant count set and err_hw_init") from the net tree. > >I fixed it up (see below) and can carry the fix as necessary. >-- >Cheers, >Stephen Rothwell sfr@xxxxxxxxxxxxxxxx >http://www.canb.auug.org.au/~sfr/ > Ack, the fix. I figured this might happen. Cheers, Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
