Re: mmotm 2019-07-16-17-14 uploaded

[Randy Dunlap]

On 7/16/19 9:38 PM, Stephen Rothwell wrote:
> Hi Randy,
> 
> On Tue, 16 Jul 2019 20:50:11 -0700 Randy Dunlap <rdunlap@xxxxxxxxxxxxx> 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.
> 

for the record:  drivers/gpio/Makefile:

<<<<<<< HEAD
obj-$(CONFIG_GPIO_BD70528)              += gpio-bd70528.o
=======
obj-$(CONFIG_GPIO_BD70528)              += gpio-bd70528.o
>>>>>>> linux-next/akpm-base



-- 
~Randy