[PATCH 0/8] Fix an unfortunate deadlock