On 7/16/19 5:15 PM, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > The mm-of-the-moment snapshot 2019-07-16-17-14 has been uploaded to > > http://www.ozlabs.org/~akpm/mmotm/ > > mmotm-readme.txt says > > README for mm-of-the-moment: > > http://www.ozlabs.org/~akpm/mmotm/ > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > more than once a week. drivers/gpu/drm/amd/amdgpu/Kconfig contains this (from linux-next.patch): --- a/drivers/gpu/drm/amd/amdgpu/Kconfig~linux-next +++ a/drivers/gpu/drm/amd/amdgpu/Kconfig @@ -27,7 +27,12 @@ config DRM_AMDGPU_CIK config DRM_AMDGPU_USERPTR bool "Always enable userptr write support" depends on DRM_AMDGPU +<<<<<<< HEAD depends on HMM_MIRROR +======= + depends on ARCH_HAS_HMM + select HMM_MIRROR +>>>>>>> linux-next/akpm-base help This option selects CONFIG_HMM and CONFIG_HMM_MIRROR if it isn't already selected to enabled full userptr support. which causes a lot of problems. -- ~Randy
