From patchwork Mon Jun 24 10:49:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11012893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 930781580 for ; Mon, 24 Jun 2019 10:49:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8015528AD9 for ; Mon, 24 Jun 2019 10:49:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7406C28AE3; Mon, 24 Jun 2019 10:49:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA93228AD9 for ; Mon, 24 Jun 2019 10:49:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC0A289338; Mon, 24 Jun 2019 10:49:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48202886F0 for ; Mon, 24 Jun 2019 10:49:15 +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 45XQyZ6Kbzz9s4Y; Mon, 24 Jun 2019 20:49:10 +1000 (AEST) Date: Mon, 24 Jun 2019 20:49:08 +1000 From: Stephen Rothwell To: Andrew Morton , Dave Airlie , DRI Subject: linux-next: manual merge of the akpm-current tree with the drm tree Message-ID: <20190624204908.64a33862@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1561373352; bh=KPlgWvFZiDZ5hy8Bt/xNt0/hF2ihC/57SqKILC0Tmxc=; h=Date:From:To:Cc:Subject:From; b=FYRfER6lqUeB9CRm57EPLNuxXAV98Neh00396z86XrwwId6ZQYeyl63JMwkVs9B2K EPwKyYlcFZFJTez0F1jDIm4fKifcyHsR4eRv6OA2Mz/svUZR/OwbDX6jPiv8gbLeH1 /+4axwQKJiWEJNhOCvX8m5RTQ9sISzEyN4c2ItusanqRT9FXXMYvLiZvuFUL8I9Amk 65Q7Okb9AtktgqM5orXDGJPiFWikrtZ0GCC0Fn19pl7/lhfhfzdIk3SzAGfJgn69cQ Ii+4xL+P/6sv6pPVkYM2uXPkYjr36NX8a0PZPP56bycLzcq9WOnvD3vkC9b4FWom4R V1CGPBNSTpG4A== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Hellstrom , Linux Next Mailing List , Linux Kernel Mailing List , Anshuman Khandual Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/memory.c between commit: 29875a52915e ("mm: Add an apply_to_pfn_range interface") from the drm tree and commit: e972cea08fb3 ("mm/pgtable: drop pgtable_t variable from pte_fn_t functions") from the akpm-current tree. I fixed it up (see below my signature, then added the following merge resolution patch as well) 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. From: Stephen Rothwell Date: Mon, 24 Jun 2019 20:40:46 +1000 Subject: [PATCH] merge fixup for "mm: Add an apply_to_pfn_range interface" Signed-off-by: Stephen Rothwell Signed-off-by: Stephen Rothwell --- include/linux/mm.h | 2 +- mm/as_dirty_helpers.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 87d53de3dee4..4404e18443ef 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2673,7 +2673,7 @@ extern int apply_to_page_range(struct mm_struct *mm, unsigned long address, unsigned long size, pte_fn_t fn, void *data); struct pfn_range_apply; -typedef int (*pter_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, +typedef int (*pter_fn_t)(pte_t *pte, unsigned long addr, struct pfn_range_apply *closure); struct pfn_range_apply { struct mm_struct *mm; diff --git a/mm/as_dirty_helpers.c b/mm/as_dirty_helpers.c index f600e31534fb..7c863626c2a4 100644 --- a/mm/as_dirty_helpers.c +++ b/mm/as_dirty_helpers.c @@ -26,7 +26,6 @@ struct apply_as { /** * apply_pt_wrprotect - Leaf pte callback to write-protect a pte * @pte: Pointer to the pte - * @token: Page table token, see apply_to_pfn_range() * @addr: The virtual page address * @closure: Pointer to a struct pfn_range_apply embedded in a * struct apply_as @@ -36,8 +35,7 @@ struct apply_as { * * Return: Always zero. */ -static int apply_pt_wrprotect(pte_t *pte, pgtable_t token, - unsigned long addr, +static int apply_pt_wrprotect(pte_t *pte, unsigned long addr, struct pfn_range_apply *closure) { struct apply_as *aas = container_of(closure, typeof(*aas), base); @@ -78,7 +76,6 @@ struct apply_as_clean { /** * apply_pt_clean - Leaf pte callback to clean a pte * @pte: Pointer to the pte - * @token: Page table token, see apply_to_pfn_range() * @addr: The virtual page address * @closure: Pointer to a struct pfn_range_apply embedded in a * struct apply_as_clean @@ -91,8 +88,7 @@ struct apply_as_clean { * * Return: Always zero. */ -static int apply_pt_clean(pte_t *pte, pgtable_t token, - unsigned long addr, +static int apply_pt_clean(pte_t *pte, unsigned long addr, struct pfn_range_apply *closure) { struct apply_as *aas = container_of(closure, typeof(*aas), base);