From owner-freebsd-stable@FreeBSD.ORG  Thu Aug 24 19:28:33 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 C896316A4DA
	for <freebsd-stable@freebsd.org>; Thu, 24 Aug 2006 19:28:33 +0000 (UTC)
	(envelope-from kris@obsecurity.org)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5692F43D67
	for <freebsd-stable@freebsd.org>; Thu, 24 Aug 2006 19:28:23 +0000 (GMT)
	(envelope-from kris@obsecurity.org)
Received: from obsecurity.dyndns.org (elvis.mu.org [192.203.228.196])
	by elvis.mu.org (Postfix) with ESMTP id 3D4E11A4DCC;
	Thu, 24 Aug 2006 12:28:23 -0700 (PDT)
Received: by obsecurity.dyndns.org (Postfix, from userid 1000)
	id B8A005164F; Thu, 24 Aug 2006 15:28:22 -0400 (EDT)
Date: Thu, 24 Aug 2006 15:28:22 -0400
From: Kris Kennaway <kris@obsecurity.org>
To: Michael Butler <imb@protected-networks.net>
Message-ID: <20060824192822.GA49845@xor.obsecurity.org>
References: <136a340a0608240312m3c273eb4o3ce8085ddd8c4b23@mail.gmail.com>
	<20060824190926.GB49364@xor.obsecurity.org>
	<44EDFB5F.8040506@protected-networks.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="LQksG6bCIzRHxTLp"
Content-Disposition: inline
In-Reply-To: <44EDFB5F.8040506@protected-networks.net>
User-Agent: Mutt/1.4.2.2i
Cc: Nikolay Kalev <nkalev@gmail.com>, freebsd-stable@freebsd.org,
	Kris Kennaway <kris@obsecurity.org>
Subject: Re: source tree borked for 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, 24 Aug 2006 19:28:33 -0000


--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Aug 24, 2006 at 03:17:51PM -0400, Michael Butler wrote:
> Kris Kennaway wrote:
> > On Thu, Aug 24, 2006 at 02:12:53PM +0400, Nikolay Kalev wrote:
> >> /usr/src/sys/netinet/ip_fw2.c:37:23: opt_ip6fw.h: No such file or dire=
ctory
> >> /usr/src/sys/netinet6/ip6_forward.c:33:23: opt_ip6fw.h: No such file
> >> or directory
>=20
>  [ .. ]
>=20
> > Perhaps someone accidentally updated their source to current?
>=20
>=20
> Nope .. a 'cd /usr/src; make kernel' prompts this behaviour on today's
> -stable sources :-(

OK, guess it was a bad merge.  Try again later.

Kris


--LQksG6bCIzRHxTLp
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (FreeBSD)

iD8DBQFE7f3WWry0BWjoQKURAuGUAJ41K23hjjq65xFKravF8uXErrcPZgCglX1v
3JPQXWDLAsuJGAb6FdW8CwU=
=kaR6
-----END PGP SIGNATURE-----

--LQksG6bCIzRHxTLp--