Hi Paul,
Now I know why you needed to hand-apply the patch.
My patch used white space characters in the indent of the folded line.
You used tab characters. Hence the conflict.
For the folded line to be properly aligned with the previous line
in the resulting Listing, it should have the same number of tabs
as the previous line. Deeper indent should be represented by
space characters.
I'm submitting a patch to fix the indent of resize_lock_mod().
Also, there is some racy accesses in hash_resize.c.
2nd patch adds READ_ONCEs/WRITE_ONCEs where I think the accesses
are racy. Please have a look to see if they are really necessary.
This is not formatted as a cover letter. Sorry about that.
Thanks, Akira
