Date: Mon, 5 Feb 2001 12:11:07 +1030 From: Greg Lehey <grog@lemis.com> To: Darren Reed <darrenr@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet fil.c ip_auth.c ip_compat.h ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.h ip_rcmd_pxy.c ip_state.c ipl.h mlfk_ipl.c Message-ID: <20010205121107.E95301@wantadilla.lemis.com> In-Reply-To: <200102041424.f14EOWL31289@freefall.freebsd.org>; from darrenr@FreeBSD.org on Sun, Feb 04, 2001 at 06:24:32AM -0800 References: <200102041424.f14EOWL31289@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sunday, 4 February 2001 at 6:24:32 -0800, Darren Reed wrote: > darrenr 2001/02/04 06:24:32 PST > > Modified files: > sys/netinet fil.c ip_auth.c ip_compat.h ip_fil.h > ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c > ip_nat.h ip_proxy.h ip_rcmd_pxy.c > ip_state.c ipl.h mlfk_ipl.c > Log: > fix conflicts I've had a look at the log for ip_state.c. Over the last year, you have put in 7 updates and changed well over 1000 lines of code. The commit logs all look the same: "fix conflicts". Can you be a little more explicit? In this file, none of the last 4 fixes seem to have made it to -STABLE, although a number of these conflicts are what I would call "bugs". Do you intend to do something about this? Greg > Revision Changes Path > 1.23 +72 -15 src/sys/netinet/fil.c > 1.21 +2 -2 src/sys/netinet/ip_auth.c > 1.13 +17 -5 src/sys/netinet/ip_compat.h > 1.18 +5 -2 src/sys/netinet/ip_fil.h > 1.14 +10 -12 src/sys/netinet/ip_frag.c > 1.11 +3 -2 src/sys/netinet/ip_frag.h > 1.17 +22 -9 src/sys/netinet/ip_ftp_pxy.c > 1.20 +99 -55 src/sys/netinet/ip_nat.c > 1.14 +6 -5 src/sys/netinet/ip_nat.h > 1.9 +3 -2 src/sys/netinet/ip_proxy.h > 1.8 +3 -3 src/sys/netinet/ip_rcmd_pxy.c > 1.20 +11 -13 src/sys/netinet/ip_state.c > 1.14 +2 -2 src/sys/netinet/ipl.h > 1.8 +13 -1 src/sys/netinet/mlfk_ipl.c > > -- Finger grog@lemis.com for PGP public key See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010205121107.E95301>