Jeff Garzik wrote:

Brice Goglin wrote:

quoted

Add multiqueue TX support to myri10ge.
    Signed-off-by: Brice Goglin [off-list ref]

Did not apply to net-next successfully...  I dropped the two patches
you submitted, as discussed in the thread where DaveM replied.  Maybe
that drop is tripping us up?

Let's resync based on DaveM's current net-next, ok?

Well, I am puzzled. The last patch I sent applies fine on top of DaveM's
net-next here. We're talking about master branch of 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git,
right ?

Actually, the same patch also applies to Linus (with a bit of
offset/fuzz) since the only differences are only 3 small DCA patches. So
I don't understand how you're getting conflicts unless you have some
remants of the nacked toeplitz stuff.

Brice