On 2017-09-12 01:48 AM, Oded Gabbay wrote: > +John, > > If Alex is fine with it then I'm fine with it as well, as long as this > is a temporary solution until some point where you have some > convergence between your internal code and the upstream one. Agreed. I want to converge those branches as soon as possible. > And of course if you have amdkfd only changes then that can be > upstreamed through me directly. Yes. > > Having said that, if you/John/Alex think that this is a more permanent > solution, then maybe a better plan is to first unify the drivers (as > was discussed many times) before starting to upstream changes. If the > 90% of the changes are in both drivers, then there is really no point > of keeping amdkfd as a separate driver. If we unify the drivers first, it would further diverge the branches. That would be counter-productive in my opinion. I'd rather get the branches to converge first and then unify the drivers so we don't have to do it twice. Regards, Felix > > Oded
