Merge with git+ssh://master.kernel.org/pub/scm/git/git.git