> Hm, that's true. There seem to have been changes since 2.6.25 which > cause the conflicts. Please could you make it apply to the current git > tree? > > Thanks. I'm firewalled for the moment (I can't use git), I'll try to do this at home. Richard.