From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B62BBC433B4 for ; Thu, 15 Apr 2021 19:20:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F44161139 for ; Thu, 15 Apr 2021 19:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234861AbhDOTVE (ORCPT ); Thu, 15 Apr 2021 15:21:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44275 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234505AbhDOTVD (ORCPT ); Thu, 15 Apr 2021 15:21:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618514439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0CvpRqi5jGMrmijnPGQZkntMS3EsXhFky90lDqKKQCU=; b=BgKQaJZvDdKUX4ziVNUZJQNTFc0MXsukDXE7BpqXC6Vu9EMYteLugtCPnFLAvHilIW37BW w5Eu2GAetp02SPjZvKplO8wEuQ9HKGSYJ5q/s2jhaWS04xHR1QA2PEJQHHFdQgqSO9lJXm ER6rOQQIhPfkRPRxh4NkjPP1RHssgyQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-535-6p05y1-QOHG4jhT6-4vN-A-1; Thu, 15 Apr 2021 15:20:35 -0400 X-MC-Unique: 6p05y1-QOHG4jhT6-4vN-A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24F3E195D563; Thu, 15 Apr 2021 19:20:33 +0000 (UTC) Received: from redhat.com (ovpn-117-254.rdu2.redhat.com [10.10.117.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 269B510013C1; Thu, 15 Apr 2021 19:20:29 +0000 (UTC) Date: Thu, 15 Apr 2021 13:20:29 -0600 From: Alex Williamson To: Jason Gunthorpe Cc: Stephen Rothwell , Dave Airlie , DRI , Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann Subject: Re: linux-next: manual merge of the vfio tree with the drm tree Message-ID: <20210415132029.3055578b@redhat.com> In-Reply-To: <20210415130855.GR227011@ziepe.ca> References: <20210415164734.1143f20d@canb.auug.org.au> <20210415130855.GR227011@ziepe.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 15 Apr 2021 10:08:55 -0300 Jason Gunthorpe wrote: > On Thu, Apr 15, 2021 at 04:47:34PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the vfio tree got a conflict in: > > > > drivers/gpu/drm/i915/gvt/gvt.c > > > > between commit: > > > > 9ff06c385300 ("drm/i915/gvt: Remove references to struct drm_device.pdev") > > > > from the drm tree and commit: > > > > 383987fd15ba ("vfio/gvt: Use mdev_get_type_group_id()") > > > > from the vfio tree. > > > > I fixed it up (I used the latter version) and can carry the fix as > > necessary. > > Yes that is right, thank you Yep, thanks! Alex