> The patch is the 3rd of 3: > > http://marc.info/?l=linux-kernel&m=117617444622279&w=2 > > Jeff applied it into his upstream tree here: > > http://marc.info/?l=linux-netdev&m=117630664627997&w=2
OK, so it's not in Linus's tree yet. Jeff, how do you want to handle this? (That last patch breaks drivers/infiniband/hw/cxgb3, and Steve posted a fix to handle it) The cleanest thing would be for you to roll up Steve's fix into the patch you merged, so that Linus's tree is never in the state where it has half the change merged. But I don't know if that fits your workflow. Thanks... - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html