IBM x306 Still No Good in 3.6

[eric <eric-list-openbsd-misc_(_at_)_catastrophe_(_dot_)_net>]

I tried in 3.5-CURRENT a few months to get an IBM x306 with two internal
SATA drives (one logical RAID defined) working. Now in 3.6-RELEASE I still
get nothing using floppy36.fs

Here's a portion of the dmesg

cd0 at scsibus0 targ 0 lun 0: <LG, CD-ROM CRN-8245B, 1.16> SCSI0 5/cdrom removable
pciide0: channel 1 ignored (not responding; disabled or no drives?)
vendor "Intel", unknown product 0x25b0 (class mass storage subclass RAID,
 rev 0x02) at pci0 dev 31 function 2 not configured
vendor "Intel", unknown product 0x25a4 (class serial bus subclass SMBus,
 rev 0x02) at pci0 dev 31 function 3 not configured isa0 at pcib0
isadma0 at isa0

Should I proceed down the -CURRENT road at this point, or is support for
this configuration still not available yet?

Thanks.

- Eric