[PATCH 2.4 0/18]: Netfilter resync with 2.6
David S. Miller
davem at davemloft.net
Tue Dec 21 01:55:09 CET 2004
On Mon, 20 Dec 2004 08:14:03 +0100
Patrick McHardy <kaber at trash.net> wrote:
> the following 18 patches resync netfilter in 2.4 with 2.6.
> They contains the ICMP+NAT fixes, Yasuyuki's IPv6 fixes
> and two misc. fixes.
> You can pull all changes from bk://220.127.116.11/nf-2.4
Please don't put things like the Bitkeeper/etc/config changeset
in your tree. I can't pull in changes like that.
Unfortunately, I can't even "bk undo -r" that bogus change since
it's not at the tip of the tree. And I don't want to "bk cset -x"
the changeset since that leaves the history of this crap in there.
Can you put together a clean tree without the Bitkeeper/etc/config
change in it? Thanks.
More information about the netfilter-devel