merging retire fence from sony kernel