pjd's ZFS 2008-07-27 patches against HEAD

Hello everyone,
I recently got fed up with all the deadlocks that ZFS seems to have on  
my home server (things hang in zfs: states, nothing can kill them,  
prevents rebooting, etc) so I decided to try out -CURRENT with the  
latest ZFS patches.  However, they no longer seem to apply cleanly.   
Specifically,

[steven_at_universe:/usr/src]% bzcat ~/zfs_20080727.patch.bz2 | sudo  
patch -s -C -p0
1 out of 14 hunks failed--saving rejects to cddl/contrib/opensolaris/ 
lib/libzpool/common/sys/zfs_context.h.rej
1 out of 11 hunks failed--saving rejects to sys/cddl/contrib/ 
opensolaris/uts/common/fs/zfs/vdev_file.c.rej
1 out of 33 hunks failed--saving rejects to sys/cddl/contrib/ 
opensolaris/uts/common/fs/zfs/zfs_ctldir.c.rej
1 out of 20 hunks failed--saving rejects to sys/cddl/contrib/ 
opensolaris/uts/common/fs/zfs/zfs_replay.c.rej
1 out of 115 hunks failed--saving rejects to sys/cddl/contrib/ 
opensolaris/uts/common/fs/zfs/zfs_vnops.c.rej
4 out of 29 hunks failed--saving rejects to sys/cddl/contrib/ 
opensolaris/uts/common/fs/zfs/zfs_znode.c.rej
1 out of 11 hunks failed--saving rejects to sys/kern/kern_jail.c.rej

I  was wondering if there is a newer patch out there (I don't see  
anything in ~pjd/patches) or if anyone has had any luck getting the  
patch to apply cleanly to the latest HEAD.

Thanks,
Steven Schlansker