kernel BUG at drivers/scsi/scsi_lib.c:1113

Has this bug been merged? I'm getting a boot-time BUG referencing this line in a raid1 task with 2.6.36-rc5, and I thought the fix had been merged in.

At least, 2c7d46ec192e4f2b350f67a0e185b9bce646cd6b looks looks like the fix, but I have that in my kernel (which, to be absolutely clear, is b30a3f6257ed2105259b404d419b4964e363928c plus a few unrelated local patches that I just manually reviewed to make absolutely certain), and I'm still exploding on boot.

If someone would like the full error message, I can find a camera to take a picture of the screen.

Thanks!