From owner-freebsd-stable@FreeBSD.ORG  Thu Jun 22 03:20:43 2006
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-stable@freebsd.org
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8B84916A474
	for <freebsd-stable@freebsd.org>; Thu, 22 Jun 2006 03:20:43 +0000 (UTC)
	(envelope-from scottl@samsco.org)
Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 053E543D53
	for <freebsd-stable@freebsd.org>; Thu, 22 Jun 2006 03:20:40 +0000 (GMT)
	(envelope-from scottl@samsco.org)
Received: from [192.168.254.11] (junior.samsco.home [192.168.254.11])
	(authenticated bits=0)
	by pooker.samsco.org (8.13.4/8.13.4) with ESMTP id k5M3KXdM014466;
	Wed, 21 Jun 2006 21:20:39 -0600 (MDT)
	(envelope-from scottl@samsco.org)
Message-ID: <449A0C7F.70301@samsco.org>
Date: Wed, 21 Jun 2006 21:20:31 -0600
From: Scott Long <scottl@samsco.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20051230
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Doug Poland <doug@polands.org>
References: <20060622024118.GA34796@polands.org>
In-Reply-To: <20060622024118.GA34796@polands.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-1.4 required=3.8 tests=ALL_TRUSTED autolearn=failed 
	version=3.1.1
X-Spam-Checker-Version: SpamAssassin 3.1.1 (2006-03-10) on pooker.samsco.org
Cc: freebsd-stable@freebsd.org
Subject: Re: Upgrading i386 box from 5.5-STABLE to 6.1-STABLE
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 03:20:43 -0000

Doug Poland wrote:
> Hello,
> 
> I'm in the middle of an attempt to upgrade an i386 box from 5.5-STABLE
> to 6.1-STABLE.  Just in case it's apropos, the box was recently upgraded
> from 5.2.1-RELEASE to 5.5-STABLE.
> 
> I am following the handbook's "The Canonical Way to Update Your System"
> and have sucessfully cvsup'd RELENG_6 and run make buildworld.
> 
> The problem I'm having is during make buildkernel.  This is the error:
> 
> 
> /usr/src/sys/dev/mii/dcphy.c: In function `dcphy_attach':
> /usr/src/sys/dev/mii/dcphy.c:172: error: `DC_PCI_CSID' undeclared (first use in this function)
> /usr/src/sys/dev/mii/dcphy.c:172: error: (Each undeclared identifier is reported only once
> /usr/src/sys/dev/mii/dcphy.c:172: error: for each function it appears in.)
> *** Error code 1
> 
> Stop in /usr/obj/usr/src/sys/GENERIC.
> *** Error code 1
> 
> Stop in /usr/src.
> *** Error code 1
> 
> Stop in /usr/src.
> 
> 
> I've read /usr/src/UPDATING, google'd and searched the web but to no avail.  
> Any help would be appreciated.
> 
> 

An incomplete and untested commit was done to the stable branch.  I'll
fix it as soon as I have the patch tested.

Scott