From patchwork Mon Jan 2 23:42:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9494269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6352C606A6 for ; Mon, 2 Jan 2017 23:42:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55B522015F for ; Mon, 2 Jan 2017 23:42:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A981269A3; Mon, 2 Jan 2017 23:42:46 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable 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 1DEBC2015F for ; Mon, 2 Jan 2017 23:42:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F1026E037; Mon, 2 Jan 2017 23:42:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 575D06E036; Mon, 2 Jan 2017 23:42:41 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3tstsq3cbmz9syB; Tue, 3 Jan 2017 10:42:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1483400559; bh=dseb1F7bQF3hLHffzV3AwCR71DDw8DqiG6bSsPEAAZM=; h=Date:From:To:Cc:Subject:From; b=T3pPOd+6o8GDWRNBylR44Sn6HTP1aUpGpckLSr0MxLhx7fyIY31Qgd82166WI7Fkc Do/fMzlrGEGXssrKQzegDKKS8+yJUKtGgTkF6XJR3trlrVeKDglxPcRsp7u27uMCsN 06OAIACbHJzHHi/kDEryVLm2M4yuK/BMafH2uRB0= Date: Tue, 3 Jan 2017 10:42:39 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Alex Williamson Subject: linux-next: build failure after merge of the drm-intel-fixes tree Message-ID: <20170103104239.67dd95ba@canb.auug.org.au> MIME-Version: 1.0 Cc: Jike Song , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-intel-fixes tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'intel_vgpu_open': drivers/gpu/drm/i915/gvt/kvmgt.c:511:32: error: dereferencing pointer to incomplete type 'struct mdev_device' vfio_unregister_notifier(&mdev->dev, VFIO_GROUP_NOTIFY, ^ Caused by commit 99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces") from the vfio-fixes tree interacting with commit 364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu") from the drm-intel-fixes tree. I applied this merge fix patch: From: Stephen Rothwell Date: Tue, 3 Jan 2017 10:38:48 +1100 Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and abstract interfaces" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index c24b665e007b..faaae07ae487 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -508,7 +508,7 @@ static int intel_vgpu_open(struct mdev_device *mdev) return ret; undo_group: - vfio_unregister_notifier(&mdev->dev, VFIO_GROUP_NOTIFY, + vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY, &vgpu->vdev.group_notifier); undo_iommu: