From: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx> Date: Mon, 17 Sep 2012 21:52:20 +0200 > Le 17/09/2012 20:25, David Miller a écrit : >> From: Vlad Yasevich <vyasevich@xxxxxxxxx> >> Date: Mon, 17 Sep 2012 14:14:35 -0400 >> >>> I think he expected you to take Eric's patch that removed those >>> pieces. >> >> Eric's patch was a cleanup, so it went into 'net-next'. >> >> Nicolas's patch is a bonafide bug fix so needs to be >> targetted at 'net' > My fault, it was 'net-next'. I will rebase them against 'net'. > > Should I post the last one (4/4) separately, against net-next? Because > without the '3/4', the cleanup is a bit larger and will cause a > conflict during the merge. Actually Nicolas, hold off on this for a bit. I'm reconsidering putting Eric's patch into 'net' and that would allow me to use your v3 patches as-is. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
