[PATCH 2.6 0/12]: netfilter update

[David S. Miller]

On Tue, 21 Sep 2004 05:20:28 +0200
Patrick McHardy <kaber at trash.net> wrote:

> following are 12 mostly random netfilter patches for 2.6.
> You can also pull all changes from bk://212.42.230.204/2.6-netfilter

There are big conflicts with Rusty's recent
seq file fixes to ip_conntrack_standalone.c

Please resync with Linus's current tree and
use "bk resolve" or whatever means to fix this
up.