From patchwork Fri Apr 3 03:58:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11471805 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6935E1667 for ; Fri, 3 Apr 2020 03:59:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3E7892078C for ; Fri, 3 Apr 2020 03:59:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="rbG//bSK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E7892078C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD5B86E1B1; Fri, 3 Apr 2020 03:58:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8F726E1B1 for ; Fri, 3 Apr 2020 03:58:58 +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 48tmQ45Mckz9sRR; Fri, 3 Apr 2020 14:58:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1585886335; bh=vPphFPznj7/OS2PTUNdEppBK08fIzt1JA7EYmLUD+7E=; h=Date:From:To:Cc:Subject:From; b=rbG//bSKRyT328C6M96TlOYdgplktlSwIPLUH6/1tUW1luCsAWdsvPppOYU5gK/K2 9l3CYr6rt1mAOfkTheSmexlEDi6L9k/5/b/pUm9v+4fdA9qUbMcIzCs0oBx56+pMGp gvLWA1u4bBeXbw5yJ4AOJiC4psQibuLgsT2Pb5OrwV4L+3ctN9K8oLbpkr/AFjOGIR 5LGHSeYeV9HD0hL2KjB2rHbAOsaaO2lvBEMpbh4Cq60cHMsgKdW629IPTnZBr7BeLk 1O14eHU74t1o1QiZJQHDlb4U+CpN070qSYjqeai+ZyuCpwxsl+BmUQX3CwLrkE/1IG 9/gUm2t15CqtQ== Date: Fri, 3 Apr 2020 14:58:51 +1100 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: <20200403145851.65194562@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: "Thomas Hellstrom \(VMware\)" , Linux Next Mailing List , Linux Kernel Mailing List , Peter Xu Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/huge_mm.h between commit: 9a9731b18c9b ("mm: Add vmf_insert_pfn_xxx_prot() for huge page-table entries") from the drm tree and commit: 7b6b88969e9d ("mm: merge parameters for change_protection()") from the akpm-current 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 include/linux/huge_mm.h index f63b0882c1b3,e60c923e68c4..000000000000 --- a/include/linux/huge_mm.h