On Friday 28 December 2007 15:30, Patrick McHardy wrote: > >> This clashes with my pending patches, which I'll push upstream > >> today. I also spent some time resyncing ip_tables and ip6_tables > >> so a diff of both (with some sed'ing) shows only the actual > >> differences, so please update ip6_tables as well. > > > > I would be happy to rediff the patch. > > > > Which tree should I sync against in order to not collide > > with your changes? > > The net-2.6.25.git tree contains all my changes. ip[6]_tables.c seem to abuse inline. This patch removes inlines except those which are used by packet matching code and thus are performance-critical. Please take this patch into netfilter queue. Signed-off-by: Denys Vlasenko -- vda