Patrick McHardy wrote: > I really can't get the other patches in at this point since they > don't really qualify as bug fixes. I'll start a nf-next tree once > Dave opens up the net-next tree, which will be in about two weeks. OK, I'll keep the patches in a internal queue and I'll resend them once you announce your nf-next tree in the ML. BTW, should I re-send even those that didn't not hit 2.6.28 but you said that were applied, I mean, for example: http://marc.info/?l=netfilter-devel&m=122355881514337&w=2 http://marc.info/?l=netfilter-devel&m=122355885514404&w=2 http://marc.info/?l=netfilter-devel&m=122364391728099&w=2 I don't mind about doing so. > Sorry about that, I know its partially my fault. Never mind, shit happens, I'm fine with having these into 2.6.29. That will give me more time to synchronize a conntrack-tools 1.0 and a ctnetlink 1.0 release. BTW, I still have to send three patches to -stable, I'm going to do that now, but what tree should I use to diff the changes? The patch should go into 2.6.24, .25, and .26. > I've tried applying this without the others, and it applies and > compiled cleanly with one minor reject: > >> --- a/net/netfilter/nf_conntrack_netlink.c >> +++ b/net/netfilter/nf_conntrack_netlink.c >> @@ -445,7 +445,7 @@ static inline size_t >> calculate_helper_room_size(const struct nf_conn *ct) >> { >> const struct nf_conn_help *help = nfct_help(ct); >> struct nf_conntrack_helper *helper; >> - size_t size; >> + size_t size = 0; >> >> if (!help) >> goto out; > > This chunk doesn't apply, but it doesn't seem to belong in the patch > anyway. Sorry, this belongs to patch 5/6. > Do you want me to apply the patch as attached to this email, or would > you prefer to rediff it? No, I'll send you a new patchset once you set your tree. This patch also needs to include the nfnl_lock/nfnl_unlock logic. -- "Los honestos son inadaptados sociales" -- Les Luthiers -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
