Merge master.kernel.org:/home/hpa/git/daemon