From: Randy Dunlap <rdunlap@infradead.org>
To: akpm@linux-foundation.org, broonie@kernel.org, mhocko@suse.cz,
sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org
Subject: Re: mmotm 2019-07-16-17-14 uploaded
Date: Tue, 16 Jul 2019 20:54:59 -0700 [thread overview]
Message-ID: <d2b7b174-36b2-e0f5-a98f-2b538eab6b6c@infradead.org> (raw)
In-Reply-To: <8165e113-6da1-c4c0-69eb-37b2d63ceed9@infradead.org>
On 7/16/19 8:50 PM, Randy Dunlap wrote:
> On 7/16/19 5:15 PM, akpm@linux-foundation.org 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.
>
>
include/uapi/linux/magic.h:
<<<<<<< HEAD
=======
#define Z3FOLD_MAGIC 0x33
>>>>>>> linux-next/akpm-base
--
~Randy
next prev parent reply other threads:[~2019-07-17 3:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 0:15 akpm
2019-07-17 3:50 ` Randy Dunlap
2019-07-17 3:54 ` Randy Dunlap [this message]
2019-07-17 4:38 ` Stephen Rothwell
2019-07-17 6:19 ` Randy Dunlap
2019-07-17 6:21 ` Randy Dunlap
2019-07-17 8:04 ` Stephen Rothwell
2019-07-17 14:55 ` Randy Dunlap
2019-07-17 21:58 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d2b7b174-36b2-e0f5-a98f-2b538eab6b6c@infradead.org \
--to=rdunlap@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox