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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <a9d0f937-ef61-1d25-f539-96a20b7f8037@infradead.org>
Date:   Tue, 16 Jul 2019 23:19:40 -0700
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
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

On 7/16/19 9:38 PM, Stephen Rothwell wrote:
> 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.
> 

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