From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751775AbdISPtj (ORCPT ); Tue, 19 Sep 2017 11:49:39 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:39736 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751365AbdISPti (ORCPT ); Tue, 19 Sep 2017 11:49:38 -0400 Subject: Re: linux-next: Tree for Sep 19 (drivers/gpu/drm/i915/i915_gem.c) To: Stephen Rothwell , Linux-Next Mailing List Cc: Linux Kernel Mailing List , dri-devel References: <20170919141557.03ffb2a7@canb.auug.org.au> From: Randy Dunlap Message-ID: <537cae4b-0157-85da-2a47-a768e34eb412@infradead.org> Date: Tue, 19 Sep 2017 08:49:36 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20170919141557.03ffb2a7@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/18/17 21:15, Stephen Rothwell wrote: > Hi all, > > Changes since 20170918: > > Linus' tree still had its build failure for which I reverted a commit. > > The drm-intel tree gained conflicts against Linus' tree. > on x86_64: In file included from ../drivers/gpu/drm/i915/i915_gem.c:5342:0: ../drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function 'mock_gem_device': ../drivers/gpu/drm/i915/selftests/mock_gem_device.c:150:20: error: 'struct dev_archdata' has no member named 'iommu' pdev->dev.archdata.iommu = (void *)-1; ^ when IOMMU_SUPPORT, INTEL_IOMMU, and AMD_IOMMU are not enabled. struct dev_archdata { #if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU) void *iommu; /* hook for IOMMU specific extension */ #endif }; -- ~Randy