From owner-cvs-src@FreeBSD.ORG  Wed Dec 29 02:07:21 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 06F1D16A4CE; Wed, 29 Dec 2004 02:07:21 +0000 (GMT)
Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7A6D043D45; Wed, 29 Dec 2004 02:07:18 +0000 (GMT)
	(envelope-from obrien@NUXI.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.13.1/8.13.1) with ESMTP id iBT25vUm014001;
	Tue, 28 Dec 2004 18:06:22 -0800 (PST)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.13.1/8.13.1/Submit) id iBT25lWe013991;
	Tue, 28 Dec 2004 18:05:47 -0800 (PST)
	(envelope-from obrien)
Date: Tue, 28 Dec 2004 18:05:32 -0800
From: "David O'Brien" <obrien@FreeBSD.org>
To: Jeff Roberson <jeff@FreeBSD.org>
Message-ID: <20041229020531.GA12575@dragon.nuxi.com>
References: <200412260013.iBQ0DcJ1074546@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200412260013.iBQ0DcJ1074546@repoman.freebsd.org>
User-Agent: Mutt/1.4.1i
X-Operating-System: FreeBSD 6.0-CURRENT
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/sys ktr.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: obrien@FreeBSD.org
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Dec 2004 02:07:21 -0000

On Sun, Dec 26, 2004 at 12:13:38AM +0000, Jeff Roberson wrote:
> jeff        2004-12-26 00:13:38 UTC
>   FreeBSD src repository
>   Modified files:
>     sys/sys              ktr.h 
>   Log:
>    - Add KTR_SCHED to produce ktr data for sys/tools/sched/schedgraph.py.
>   
>   Revision  Changes    Path
>   1.26      +3 -2      src/sys/sys/ktr.h
> http://cvsweb.freebsd.org/src/sys/sys/ktr.h.diff?r1=1.25&r2=1.26

This conflicted with your
http://www.chesapeake.net/~jroberson/smpffs.diff patch:

    +#define KTR_BUF         0x20000000              /* Buffer cache */

do you have an updated patch set?

-- 
-- David  (obrien@FreeBSD.org)