Hi Daniel, On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > > How are we going to handle this now? The refactor is deeply burried in > drm-misc, I guess you could cherry-pick the relevant patches over. But > that'll probably lead to more conflicts because git will get confused. I'll just keep applying the merge resolution patch and will remind Dave and Greg about it during the week before the merge window opens so that they can let Linus know that the fix up is needed. -- Cheers, Stephen Rothwell _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
