lkml.org 
[lkml]   [2007]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.
From
Date
 > 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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-04-12 18:11    [W:0.154 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site