From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECFADC76186 for ; Wed, 17 Jul 2019 06:19:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C51C921743 for ; Wed, 17 Jul 2019 06:19:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="RZN+6hkY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729003AbfGQGTp (ORCPT ); Wed, 17 Jul 2019 02:19:45 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:55156 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725932AbfGQGTp (ORCPT ); Wed, 17 Jul 2019 02:19:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=o9OnSlZJU5DUUCjEct8az2tBr1Fx/bIZ5665+npBK6E=; b=RZN+6hkYNj53BCOuGJCII7CTy 4UP0nDFKHWBfBLP60hguy5Cccg/HS5uW+WBamn3keHex3uSblsfTqp/vgYdbxQgJygTaMedfhoYUI +MfE8bpoa4voUC9FwnPrYXuSMFpTNjBGgvZChZaM29s312FbxnXBlBIU3L4ziP7x4fonUeTudxLbD JFV8ZTPulU5KD102qXFqqeFMKpKGgxZ7zr65/CSgBCtWteOLA7g4OjTlLVZrqbDWNgc5W2yLDndTQ O8QO1XeaqDETBPXDnLRo0JFqvNBz4PHvfzQkYgeTt8M2uTKxDLA3b4XCUzqqLmyglTrWXFS3mrpiu TtiQN4IbA==; Received: from static-50-53-52-16.bvtn.or.frontiernet.net ([50.53.52.16] helo=dragon.dunlab) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hndHz-0005Xd-OA; Wed, 17 Jul 2019 06:19:43 +0000 Subject: Re: mmotm 2019-07-16-17-14 uploaded To: Stephen Rothwell Cc: akpm@linux-foundation.org, broonie@kernel.org, mhocko@suse.cz, linux-next@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org References: <20190717001534.83sL1%akpm@linux-foundation.org> <8165e113-6da1-c4c0-69eb-37b2d63ceed9@infradead.org> <20190717143830.7f7c3097@canb.auug.org.au> From: Randy Dunlap Message-ID: Date: Tue, 16 Jul 2019 23:19:40 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20190717143830.7f7c3097@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On 7/16/19 9:38 PM, Stephen Rothwell wrote: > Hi Randy, > > On Tue, 16 Jul 2019 20:50:11 -0700 Randy Dunlap 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