Merge tag 'locks-v4.2-1' of git://git.samba.org/jlayton/linux