Hi,
On 2/28/23 15:50, Andi Shyti wrote:
> Commit 67b7836d4458 ("drm/shmem-helper: Switch to reservation
> lock") removes the drm_gem_shmem_get_pages_locked() and
> drm_gem_shmem_put_pages_locked().
>
> But then commit ddddedaa0db9 ("drm/shmem-helper: Fix locking for
> drm_gem_shmem_get_pages_sgt()") reintroduces it.
>
> Somehow these two commits got mixed up and produce the following
> compile error:
The 67b7836d4458 goes after ddddedaa0db9 in misc-next. It was a bad
merge conflict resolution in drm-tip that was fixed yesterday, there is
no problem in misc-next. Where do you see this error?
--
Best regards,
Dmitry
