[PATCH NF_CONNTRACK 1/9]: Fix multiple problems with TCP window tracking

[Yasuyuki KOZAKAI]

Hi, Michal,

From: Michal Rokos <michal at rokos.info>
Date: Mon, 23 May 2005 15:46:58 +0200

> Hello,
> 
> >>>>> "YK" == Yasuyuki KOZAKAI <yasuyuki.kozakai at toshiba.co.jp> writes:
> YK>
> YK> This patch follows the recent changes to ip_conntrack.
> YK>
> 
> could I ask you against what is this patch?
> 
> I'm using 
> http://svn.netfilter.org/netfilter/trunk/patch-o-matic-ng/nf_conntrack and 
> I'm getting rejects when applying this patch...

Patrick prepared bk tree for submission as follows and I have been
sending patches to him since then to avoid duplicated work and
inconsistency between svn and his tree.

From: Patrick McHardy <kaber at trash.net>
Subject: nf_conntrack tree
Date: Wed, 16 Mar 2005 01:35:32 +0100

> I'm working on getting nf_conntrack ready for submission. To make it
> easier for people to participate, I've exported my tree through
> bitkeeper and as plain patch. It currently contains nf_conntrack as
> found in pomng plus a couple of ported ip_conntrack fixes:
> 
> bk://numenor.coreworks.de/nf-2.6-nfct
> http://numenor.coreworks.de/~kaber
> 
> The tree and the diff will be kept up-to-date when changes are made.

In this time, I applied
	http://numenor.coreworks.de/~kaber/nf_conntrack-03052005_01.diff

to cloned linus tree at 2005/05/22 00:37(JST: +9:00) before making their
patches.

Which tree should I try to keep to update ?

Regards,

-----------------------------------------------------------------
Yasuyuki Kozakai @ USAGI Project <yasuyuki.kozakai at toshiba.co.jp>