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