Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux