From patchwork Tue Oct 4 10:00:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12998089 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12C01C433FE for ; Tue, 4 Oct 2022 10:00:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E0F7710E1ED; Tue, 4 Oct 2022 10:00:39 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85D0810E1ED for ; Tue, 4 Oct 2022 10:00:34 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4MhY9V5b2yz4xFv; Tue, 4 Oct 2022 21:00:30 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1664877631; bh=0Ci8/uUmOT04hPf5Pe5xj4GFHiksvHxBWHES0kA602s=; h=Date:From:To:Cc:Subject:From; b=Ha4EyGe2tGv5iHR/nXG4182TK2vfcWT3BQ88cHE9e6opq9Ge9UNmYIJVkCEoeQoCH 7cB/kPHNCQdsy/GL2cBJr9vR3LJXFY79gCTKWFbEVfOAvD4yd6/O6/5uqnkTvengfU 6j4dcFbiMbNg923l2r1KonYf85Q5SqfECvT3eC8KFyylEFWrla0NEbwJ3vE8TfTTF6 8tWYcPIE9xB/Fy8p1h4UQOQGz/Y+1s9VM8xTuzsSegf/szjKbwzwW5KUt/aSpxcmwJ HzGtyv7zP09J1Nrvb7MhzfgbG5G5eARTmn7IHbacotQKZKhcz/L4kfHqP34mp7gkGE DKIkBi11P1Wbw== Date: Tue, 4 Oct 2022 21:00:29 +1100 From: Stephen Rothwell To: Andrew Morton , Dave Airlie Subject: linux-next: manual merge of the mm tree with the drm tree Message-ID: <20221004210029.7412fcfd@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philip Yang , Alistair Popple , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the mm tree got a conflict in: drivers/gpu/drm/amd/amdkfd/kfd_migrate.c between commit: 3a876060892b ("drm/amdkfd: Migrate in CPU page fault use current mm") from the drm tree and commit: c5f45c35acc4 ("mm/memory.c: fix race when faulting a device private page") from the mm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/amd/amdkfd/kfd_migrate.c index c70c026c9a93,97a684568ae0..000000000000 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c