Re: linux-next: net trivial merge conflict

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 3 Apr 2008 15:37:40 +1100

> Just a trivial conflict between the version strings in drivers/net/s2io.c
> between your tree and Linus'.  I kept the later one from Linus' tree.
> 
> The commits are f70e550df83f9eb98b342257aa589860630eae41 ("S2io: Version
> update for Tx completion patch") in Linus' tree and
> cf374a855363ea2ad06a1c08fc513024295334cc ("S2io: Version update for
> multiqueue and vlan patches") in yours.

Yes I just resolved it the same way just now.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html