From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933426AbdACEHd (ORCPT <rfc822;w@1wt.eu>);
        Mon, 2 Jan 2017 23:07:33 -0500
Received: from ozlabs.org ([103.22.144.67]:51993 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1757063AbdACEHV (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 2 Jan 2017 23:07:21 -0500
Date: Tue, 3 Jan 2017 15:07:18 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Alex Williamson <alex.williamson@redhat.com>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Jike Song <jike.song@intel.com>
Subject: Re: linux-next: build failure after merge of the drm-intel-fixes
 tree
Message-ID: <20170103150709.543d4f75@canb.auug.org.au>
In-Reply-To: <20170103025929.35gp5n27uc7iszra@zhen-hp.sh.intel.com>
References: <20170103104239.67dd95ba@canb.auug.org.au>
        <20170103025929.35gp5n27uc7iszra@zhen-hp.sh.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Zhenyu,

On Tue, 3 Jan 2017 10:59:29 +0800 Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
>
> Alex, I liked to have kvmgt related mdev interface change be merged through
> vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> below fix in your tree? I think in general for possible interface change in
> future we still need a pull request for i915 to resolve dependence earlier.

This only happens because I merge both trees (I think) ...

-- 
Cheers,
Stephen Rothwell