UPDATE: ATA mkIII official patches for releng_5

[Scot Hetzel]

On 4/28/05, Scot Hetzel <swhetzel at gmail.com> wrote:
> On 4/28/05, Damian Gerow <dgerow at afflictions.org> wrote:
> > I'm using the latest -n patchset.  I tried against RELENG_5_4, and against 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 know
> > /what/.
> 
> 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.
> 
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