boot hang: "ata1: resetting devices .. done" (5.1-CURRENT, IBM T30)

Recently I posted about boot hangs if I have atapicam defined in the
kernel and a DVD/CD-RW drive in the ultrabay on my T30.

As of today's CVSup, I get a hang on boot if the drive is in there
regardless of atapicam being defined or not.

	ad0: 38154MB <TOSHIBA MK4019GAX> [77520/16/63] at ata0-master UDMA100
	ata1: resetting devices ..
	done

Then it hangs so hard I have to power cycle it to get the system to notice
me.

The hang does not happen if the DVD/CD-RW drive is pulled from the system.

Booting an old kernel (previous to this problem) and searching the logs, I see:
	Oct  7 12:46:24 tylendel kernel: atapci0: <Intel ICH3 UDMA100 controller> 
port 0x1860-0x186f,0x374-0x377,0x170-0x177,0x3f4-0x3f7,0x1f0-0x1f7 at device 
31.1 on pci0
	Oct  7 12:46:24 tylendel kernel: ata0: at 0x1f0 irq 14 on atapci0
	Oct  7 12:46:24 tylendel kernel: ata0: [MPSAFE]
	Oct  7 12:46:24 tylendel kernel: ata1: at 0x170 irq 15 on atapci0
	Oct  7 12:46:24 tylendel kernel: ata1: [MPSAFE]

and
	Oct  7 12:46:24 tylendel kernel: GEOM: create disk ad0 dp=0xc5beb670
	Oct  7 12:46:24 tylendel kernel: ad0: 38154MB <TOSHIBA MK4019GAX> 
[77520/16/63] at ata0-master UDMA100
	Oct  7 12:46:24 tylendel kernel: acd0: CDRW <UJDA720 DVD/CDRW> at ata1-master 
UDMA33

I'd really appreciate any help that could be tossed my direction.

thanks,
nomad
 -----------                       - Lee "nomad" Damon -          \
play: nomad_at_castle.org    or castle!nomad                          \
work: nomad_at_ee.washington.edu                                       \
                                 				    /\
Seneschal, Castle PAUS.                                            /  \
                "Celebrate Diversity"                             /    \