On Thu, Jul 04, 2019 at 04:37:51PM -0700, Dan Williams wrote: > > If we give up on CH's series the hmm.git will not have conflicts, > > however we just kick the can to the next merge window where we will be > > back to having to co-ordinate amd/nouveau/rdma git trees and -mm's > > patch workflow - and I think we will be worse off as we will have > > totally given up on a git based work flow for this. :( > > I think the problem would be resolved going forward post-v5.3 since we > won't have two tress managing kernel/memremap.c. This cycle however > there is a backlog of kernel/memremap.c changes in -mm. IHMO there is always something :( CH's series had something like 5 different collisions already, and I think we did a good job of with everything but your subsection patches. Jason
