From owner-freebsd-current@FreeBSD.ORG  Sun Nov 11 01:07:53 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A62F016A41A
	for <freebsd-current@freebsd.org>; Sun, 11 Nov 2007 01:07:53 +0000 (UTC)
	(envelope-from dimitry@andric.com)
Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net
	[IPv6:2001:7b8:2ff:146::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 6276613C4D9
	for <freebsd-current@freebsd.org>; Sun, 11 Nov 2007 01:07:53 +0000 (UTC)
	(envelope-from dimitry@andric.com)
Received: from [IPv6:2001:7b8:3a7:0:8049:34f6:cac8:aa95] (unknown
	[IPv6:2001:7b8:3a7:0:8049:34f6:cac8:aa95])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by tensor.andric.com (Postfix) with ESMTP id 682CF3E;
	Sun, 11 Nov 2007 02:07:52 +0100 (CET)
Message-ID: <473655EB.1050909@andric.com>
Date: Sun, 11 Nov 2007 02:07:55 +0100
From: Dimitry Andric <dimitry@andric.com>
User-Agent: Thunderbird 2.0.0.7pre (Windows/20071029)
MIME-Version: 1.0
To: "Aryeh M. Friedman" <aryeh.friedman@gmail.com>
References: <47358981.6090701@gmail.com> <47364087.70103@andric.com>
	<47364115.5080208@gmail.com>
In-Reply-To: <47364115.5080208@gmail.com>
X-Enigmail-Version: 0.95.5
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-current@freebsd.org
Subject: Re: errors in the latest kernel update
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2007 01:07:53 -0000

Aryeh M. Friedman wrote:
>> You have CVS merge conflicts.  Fix them first, before attempting to
>>  compile again. :)
> Unless I complete misunderstood developement(7) I don't see how this
> is possible since I used the procedure it lists and I have made no
> local modifications.

Unfortunately, it's rather easy to screw up updates or merges with CVS,
especially when using branches and/or sticky tags.  It must be something
you did locally.  It's impossible to tell what went wrong without more
information, though.

However, since you made no local modifications, can't you simply zap
your whole src tree and re-checkout?  That should fix your problem.