I made a slight mess of Documentation/filesystems/Locking; resolve conflicts with upstream before fixing it up.