[libata reset-seq] build and merge fixes