[PATCH F18] team: backport fixes from linus's tree