Ewan,
It also appears as if the patches to hptiop, hisi_sas and bfa need to be fixed up. I don't have a test environment for these, although I might be able to modify the test environment for bfa. Martin/James, what about the others?
I'm afraid I don't have any of those. But I'm sure John would be happy to check hisi_sas.