On Tue, Apr 11, 2023 at 8:00 AM Daniel Vetter <dan...@ffwll.ch> wrote: > > On Tue, Apr 11, 2023 at 07:55:33AM -0700, Rob Clark wrote: > > On Tue, Apr 11, 2023 at 3:27 AM Daniel Vetter <dan...@ffwll.ch> wrote: > > > > Konrad Dybcio (18): > > > > drm/msm/adreno: Use OPP for every GPU generation > > > > > > This had a minor conflict with refactoring from drm-misc-next, I went > > > what's in your pr. Please double check I didn't screw up, but at least it > > > compiles :-) > > > > Hmm, am I looking at the wrong thing.. the conflict I'm seeing is with > > drm_gem_lru (and looks to be correctly resolved) > > Yeah that one was trivial. Unfortunately git does not report anything if > you only keep one or the other branch entirely in your resolution, so the > only way for you to see the conflict is to re-create the merge :-) Or at > least my git foo isn't good enough for a better way ...
Ahh, right.. yes, this looks like the correct resolution (change coming from drm-misc side was something that was removed from msm-next side) BR, -R > -Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
