Minor fixes at the branch for 3.10 because kuid_t is now structure