Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm...