[PATCH] uml: fix patch mismerge