The patches are in the libata tree, so I committed them to the stable branch. The BUG_ON was removed.