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