Date: Fri, 18 Jun 2004 13:31:52 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: phk@phk.freebsd.dk Cc: nate@root.org Subject: Re: cvs commit: src/sys/contrib/dev/ath/freebsd ah_osdep.c Message-ID: <20040618.133152.38712532.imp@bsdimp.com> In-Reply-To: <49344.1087584105@critter.freebsd.dk> References: <200406181133.26019.sam@errno.com> <49344.1087584105@critter.freebsd.dk>
index | next in thread | previous in thread | raw e-mail
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
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040618.133152.38712532.imp>