Merge "Add 6.1 kernel to current matrix"