From owner-cvs-all Mon Feb 5 17:13: 1 2001 Delivered-To: cvs-all@freebsd.org Received: from wantadilla.lemis.com (wantadilla.lemis.com [192.109.197.80]) by hub.freebsd.org (Postfix) with ESMTP id 6116537B6A6; Mon, 5 Feb 2001 17:12:36 -0800 (PST) Received: by wantadilla.lemis.com (Postfix, from userid 1004) id D24FA6A90D; Tue, 6 Feb 2001 11:42:34 +1030 (CST) Date: Tue, 6 Feb 2001 11:42:34 +1030 From: Greg Lehey To: Darren Reed , Darren Reed Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, asmodai@wxs.nl 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: <20010206114234.C45171@wantadilla.lemis.com> References: <20010205181907.V462@wantadilla.lemis.com> <200102051642.DAA10687@avalon.reed.wattle.id.au> <200102041424.f14EOWL31289@freefall.freebsd.org> <20010205121107.E95301@wantadilla.lemis.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010205121107.E95301@wantadilla.lemis.com>; from grog@lemis.com on Mon, Feb 05, 2001 at 12:11:07PM +1030 Organization: LEMIS, PO Box 460, Echunga SA 5153, Australia Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.lemis.com/~grog X-PGP-Fingerprint: 6B 7B C3 8C 61 CD 54 AF 13 24 52 F8 6D A4 95 EF Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tuesday, 6 February 2001 at 3:42:32 +1100, Darren Reed wrote: > In some email I received from Greg Lehey, sie wrote: >> On Monday, 5 February 2001 at 8:42:23 +0100, Jeroen Ruigrok/Asmodai wrote: >>> -On [20010205 03:00], Greg Lehey (grog@lemis.com) wrote: >>>> 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? >>> >>> Last time I asked Darren wanted to do that himself, otherwise it would >>> have been MFC'd already, like I did for Sheldon's (g)awk. >> >> Darren, comments? I'd personally prefer you did it, but somebody >> needs to do so. One of the bugs unfixed in -STABLE caused me >> considerable problems a few weeks back. > > Sorry, could you resend the original email which talks about the issue? > I missed it in my daily purge of freebsd cvs email... Attached. Recall, though, that committers are expected to read the commit logs, especially when they relate to their area of activity :-) > or is there a PR where this information is available? No, it was just a reply to your message. Here it is again. Greg On Monday, 5 February 2001 at 12:11:07 +1030, Greg Lehey wrote: > 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