From owner-freebsd-stable@FreeBSD.ORG  Thu Apr 28 18:19:07 2005
Return-Path: <owner-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 081D416A4CE
	for <freebsd-stable@freebsd.org>;
	Thu, 28 Apr 2005 18:19:07 +0000 (GMT)
Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.207])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9545143D49
	for <freebsd-stable@freebsd.org>;
	Thu, 28 Apr 2005 18:19:06 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: by wproxy.gmail.com with SMTP id 69so665461wri
	for <freebsd-stable@freebsd.org>;
	Thu, 28 Apr 2005 11:19:06 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
	s=beta; d=gmail.com;
	h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=qHTTuPNXzW1/8Om8dMO3GzTPHqQsqHFz2OA0rHRFJQJOQ9kMrLQDZ5JlCYfxoddeZBeBSpIyN4sbMuCHGhaNcH5gRMmLqNkG/ShIkPVpXIizHXjeg6Yc1hvr5bLdDHOjGSCN5SFidXbmD+qQBhqVgPkdrmPj5oUQRvHBb11NgNw=
Received: by 10.54.21.23 with SMTP id 23mr882101wru;
        Thu, 28 Apr 2005 11:19:06 -0700 (PDT)
Received: by 10.54.29.77 with HTTP; Thu, 28 Apr 2005 11:19:06 -0700 (PDT)
Message-ID: <790a9fff05042811192eeb4683@mail.gmail.com>
Date: Thu, 28 Apr 2005 13:19:06 -0500
From: Scot Hetzel <swhetzel@gmail.com>
To: Damian Gerow <dgerow@afflictions.org>
In-Reply-To: <790a9fff050428111549fbe561@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <20050418120423.GA697@afflictions.org>
	 <20050420154258.GI720@afflictions.org>
	 <20050428093037.GC69135@afflictions.org>
	 <200504281207.41387.josemi@redesjm.local>
	 <20050428154112.GD69135@afflictions.org>
	 <790a9fff050428111549fbe561@mail.gmail.com>
cc: freebsd-stable@freebsd.org
Subject: Re: UPDATE: ATA mkIII official patches for releng_5
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Scot Hetzel <swhetzel@gmail.com>
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, 28 Apr 2005 18:19:07 -0000

On 4/28/05, Scot Hetzel <swhetzel@gmail.com> wrote:
> On 4/28/05, Damian Gerow <dgerow@afflictions.org> wrote:
> > I'm using the latest -n patchset.  I tried against RELENG_5_4, and agai=
nst a
> > RELENG_5 sup from last night.  I still get the kmod.mk build error.
> >
> > I'm positive it's something about my build environment, but I don't kno=
w
> > /what/.
>=20
> If you modified your /etc/make.conf, try commenting all your changes
> out.  Or post a copy here so someone can see if there is a problem in
> your make.conf file.
>=20
Didn't notice your earlier post about your make.conf file.

Look at the ata/Makefile and make sure there are no lines like:

<<<<<
:
----
:
>>>>>

As this indicates a conflict is in the file, and you'll need to fix it.

Scot