On Jul 31 2007 12:31, Laszlo Attila Toth wrote:
MD5 checksums of the tarballs:
a655fd090c06827bd6927f2b894ee178 tproxy-4.0.0-2.6.23-rc1.tgz d7175531d67beaab48293cd86cac5d21 tproxy-4.0.0-ubuntu-2.6.17-12.39.tgz
That can not compile, because there are still a lot of merge markers. @@ -1950,7 +2065,14 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, rth->fl.fl4_src == saddr && rth->fl.iif == iif && rth->fl.oif == 0 && +<<<<<<< HEAD:net/ipv4/route.c rth->fl.mark == skb->mark && +======= +#ifdef CONFIG_IP_ROUTE_FWMARK + rth->fl.fl4_fwmark == skb->nfmark && +#endif + !(rth->u.dst.flags & DST_DIVERTED) && +>>>>>>> 2bc8cb4... initial import of tproxy4 (2007-07-30):net/ipv4/route.c rth->fl.fl4_tos == tos) { rth->u.dst.lastuse = jiffies; dst_hold(&rth->u.dst); Jan --