Merge "base: genlock: handle error while creating lock/handle inode" into msm-3.4