Merge tag 'docs-6.1-2' of git://git.lwn.net/linux