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