Date: Thu, 28 Apr 2005 14:49:50 -0400 From: Damian Gerow <dgerow@afflictions.org> To: Scot Hetzel <swhetzel@gmail.com> Cc: freebsd-stable@freebsd.org Subject: Re: UPDATE: ATA mkIII official patches for releng_5 Message-ID: <20050428184950.GE1261@afflictions.org> In-Reply-To: <790a9fff05042811192eeb4683@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050428184950.GE1261>