I was wrong, maybe I mixed the numbers and wanted to write 4.6.8. I always end up in a btrfs merge commit as the bad one and then only get good commits. I hate git-merge