On Mon, Jan 30, 2017 at 03:14:38PM -0700, Ross Zwisler wrote: > On Mon, Jan 30, 2017 at 03:09:39PM -0700, Ross Zwisler wrote: > > > This patch applies cleanly to mmots/master, which is currently at > > v4.10-rc5-mmots-2017-01-26-15-49. > > Which may not be what you want... The reason I was looking at this code was > because it was recently changed by Dave Jiang to remove the 'vma' argument > from all the fault handlers. > > So, would you rather: > > 1) Take it through the -mm tree to avoid merge conflicts, in which case I'll > add akpm to the thread. > > 2) Take it through your tree & deal with merge conflicts later, in which case > I can rebase on your tree or on v4.10-rc6. > > 3) Just drop it and keep the extra 20 lines or whatever that the complier will > just optimize out. > > I'm fine with any of the above. drm_vm.c is legacy horror shows, we're not going to touch in in the drm tree (except for other trivial clenaups). So perfectly fine to merge it all through -mm. Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx> -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
