Messages in this thread | | | From | Linus Torvalds <> | Date | Tue, 2 Jun 2020 14:22:57 -0700 | Subject | Re: [git pull] drm for 5.8-rc1 |
| |
On Tue, Jun 2, 2020 at 2:21 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > Hmm. Some of them are due to your previous mis-merges. > > Your commit 937eea297e26 ("Merge tag 'amd-drm-next-5.8-2020-04-24' of > git://people.freedesktop.org/~agd5f/linux into drm-next") seems to > have mis-merged the CONFIG_DEBUG_FS thing in > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.
Sorry, wrong filename. That should have been drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c, I cut-and-pasted the wrong path from the conflict list..
Linus
| |