From owner-freebsd-stable@FreeBSD.ORG Thu Apr 28 18:50:03 2005 Return-Path: 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 26E5016A4CE for ; Thu, 28 Apr 2005 18:50:03 +0000 (GMT) Received: from pandora.afflictions.org (asylum.afflictions.org [64.7.134.90]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DE6543D39 for ; Thu, 28 Apr 2005 18:50:02 +0000 (GMT) (envelope-from dgerow@afflictions.org) Received: from localhost (localhost [127.0.0.1]) by pandora.afflictions.org (Postfix) with ESMTP id 4252978C6D; Thu, 28 Apr 2005 14:52:02 -0400 (EDT) Received: from pandora.afflictions.org ([127.0.0.1]) by localhost (pandora.afflictions.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 81294-04; Thu, 28 Apr 2005 14:51:55 -0400 (EDT) Received: from dementia.afflictions.org (dementia.afflictions.org [172.19.206.56]) by pandora.afflictions.org (Postfix) with ESMTP id 91E2178C35; Thu, 28 Apr 2005 14:51:54 -0400 (EDT) Received: by dementia.afflictions.org (Postfix, from userid 1001) id 41F1933C30; Thu, 28 Apr 2005 14:49:51 -0400 (EDT) Date: Thu, 28 Apr 2005 14:49:50 -0400 From: Damian Gerow To: Scot Hetzel Message-ID: <20050428184950.GE1261@afflictions.org> 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> <790a9fff05042811192eeb4683@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <790a9fff05042811192eeb4683@mail.gmail.com> X-GPG-Fingerprint: B3D7 D901 A53A 1A99 BFD6 E6DF 9F3B 742B C288 9CC9 User-Agent: Mutt/1.5.9i X-Virus-Scanned: amavisd-new at pandora.afflictions.org 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 List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 18:50:03 -0000 Thus spake Scot Hetzel (swhetzel@gmail.com) [28/04/05 14:21]: : 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. Nope. All patches applied without problems. Makefile and Makefile.inc (and that which Makefile.inc includes) all look clean to me. My kmod.mk is the same as one on a working system. I'm at a loss. - Damian