From owner-cvs-all@FreeBSD.ORG  Fri Jun 18 19:34:30 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 91F4916A4CE; Fri, 18 Jun 2004 19:34:30 +0000 (GMT)
Received: from harmony.village.org (rover.village.org [168.103.84.182])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2B08D43D48; Fri, 18 Jun 2004 19:34:30 +0000 (GMT)
	(envelope-from imp@bsdimp.com)
Received: from localhost (warner@rover2.village.org [10.0.0.1])
	by harmony.village.org (8.12.11/8.12.11) with ESMTP id i5IJVY42053079;
	Fri, 18 Jun 2004 13:31:34 -0600 (MDT)
	(envelope-from imp@bsdimp.com)
Date: Fri, 18 Jun 2004 13:31:52 -0600 (MDT)
Message-Id: <20040618.133152.38712532.imp@bsdimp.com>
To: phk@phk.freebsd.dk
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <49344.1087584105@critter.freebsd.dk>
References: <200406181133.26019.sam@errno.com>
	<49344.1087584105@critter.freebsd.dk>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: sam@errno.com
cc: src-committers@FreeBSD.org
cc: cvs-src@FreeBSD.org
cc: cvs-all@FreeBSD.org
cc: nate@root.org
Subject: Re: cvs commit: src/sys/contrib/dev/ath/freebsd ah_osdep.c 
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jun 2004 19:34:30 -0000

In message: <49344.1087584105@critter.freebsd.dk>
            "Poul-Henning Kamp" <phk@phk.freebsd.dk> writes:
: In message <200406181133.26019.sam@errno.com>, Sam Leffler writes:
: >On Friday 18 June 2004 11:30 am, Nate Lawson wrote:
: >> On Fri, 18 Jun 2004, Poul-Henning Kamp wrote:
: >> > phk         2004-06-18 08:53:55 UTC
: >> >
: >> >   FreeBSD src repository
: >> >
: >> >   Modified files:
: >> >     sys/contrib/dev/ath/freebsd ah_osdep.c
: >> >   Log:
: >> >   Add missing <sys/module.h> include.
: >> >
: >> >   Approved by:    sam
: >> >
: >> >   Revision  Changes    Path
: >> >   1.2       +62 -32    src/sys/contrib/dev/ath/freebsd/ah_osdep.c
: >>
: >>     ^^^       ^^^^^^^
: >>
: >> Intentional vendor branch change?
: >
: >Yes, I decided to remove this file from the Atheros hal depot and instructed 
: >phk to do this for me.
: 
: I'll admit that I'm still confused about the "+62 -32" and a compile
: error report I saw in email which I couldn't reproduce.  I asked the
: CVS crew if I goofed but havn't heard a reply yet.

If 1.1.1.x has a bunch of changes, and then you make a 1 line change
to take it off the vendor branch, you get a diff between 1.1.1.1 and
1.1.1.x AND that one line change (eg the change is between 1.1 and 1.2
not 1.1.1.x and 1.2).

Warner