Stephen, On 4/30/20 22:30, Gustavo A. R. Silva wrote: >> This is now a conflict between the net-next and kspp-gustavo trees. >> > > Thanks for reporting this. I think the best solution, for now, is to remove the > changes from my tree. I'll do it right away. > I just updated my -next tree. This conflict should be resolved now. :) Thanks -- Gustavo
