Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux