From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752795AbcADHqP (ORCPT ); Mon, 4 Jan 2016 02:46:15 -0500 Received: from ozlabs.org ([103.22.144.67]:59486 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751925AbcADHp4 (ORCPT ); Mon, 4 Jan 2016 02:45:56 -0500 Date: Mon, 4 Jan 2016 18:45:54 +1100 From: Stephen Rothwell To: Andrew Morton , Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Williams , Laurent Pinchart , Tomi Valkeinen Subject: linux-next: manual merge of the akpm-current tree with the drm tree Message-ID: <20160104184554.08661f70@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/gpu/drm/omapdrm/omap_gem.c between commit: f4302747af02 ("drm: omapdrm: gem: Move global usergart variable to omap_drm_private") from the drm tree and commit: 0cf445f1b0c1 ("mm, dax, gpu: convert vm_insert_mixed to pfn_t") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/omapdrm/omap_gem.c index 984462622291,ceba5459ceb7..000000000000 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@@ -496,8 -480,9 +498,9 @@@ static int fault_2d(struct drm_gem_obje pfn, pfn << PAGE_SHIFT); for (i = n; i > 0; i--) { - vm_insert_mixed(vma, (unsigned long)vaddr, pfn); + vm_insert_mixed(vma, (unsigned long)vaddr, + __pfn_to_pfn_t(pfn, PFN_DEV)); - pfn += usergart[fmt].stride_pfn; + pfn += priv->usergart[fmt].stride_pfn; vaddr += PAGE_SIZE * m; }