Re: [PATCH] net/ipv4/netfilter/ip_tables.c: remove some inlines

[Patrick McHardy]

Denys Vlasenko wrote:
> On Monday 17 December 2007 14:47, 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/