Jan Engelhardt wrote: > On Tuesday 2010-03-16 18:01, Patrick McHardy wrote: >> Jan Engelhardt wrote: >>> --- >>> net/netfilter/Kconfig | 21 +++++------------ >>> net/netfilter/Makefile | 1 - >>> net/netfilter/xt_CT.c | 54 ++++++++++++++++++++++++++++++++++--------- >>> net/netfilter/xt_NOTRACK.c | 53 ------------------------------------------- >>> 4 files changed, 48 insertions(+), 81 deletions(-) >>> delete mode 100644 net/netfilter/xt_NOTRACK.c >> Since CT is supposed to obsolete NOTRACK, I don't want to merge >> these two. Better schedule it for removal in one or two years. > > Ok, perfect. Just skip this patch then for now. (Should I update the git > branch?) Yes please. > I'll send you another patch later on documenting the fact in > Documentation/feature-removal-schedule.txt in one of the next > microrounds. Thanks. -- 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