Applied to nvme-5.11 after fixing a bunch of overly long lines and removing the changelog from the commit log.