[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190717143830.7f7c3097@canb.auug.org.au>
Date: Wed, 17 Jul 2019 14:38:30 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Randy Dunlap <rdunlap@...radead.org>
Cc: akpm@...ux-foundation.org, broonie@...nel.org, mhocko@...e.cz,
linux-next@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-mm@...ck.org, linux-kernel@...r.kernel.org,
mm-commits@...r.kernel.org
Subject: Re: mmotm 2019-07-16-17-14 uploaded
Hi Randy,
On Tue, 16 Jul 2019 20:50:11 -0700 Randy Dunlap <rdunlap@...radead.org> wrote:
>
> 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.
Luckily, I don't apply that patch (I instead merge the actual
linux-next tree at that point) so this does not affect the linux-next
included version of mmotm.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists