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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 8BC1BC433B4 for ; Thu, 15 Apr 2021 13:09:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6DBF161249 for ; Thu, 15 Apr 2021 13:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233036AbhDONJq (ORCPT ); Thu, 15 Apr 2021 09:09:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233037AbhDONJW (ORCPT ); Thu, 15 Apr 2021 09:09:22 -0400 Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76C0AC061574 for ; Thu, 15 Apr 2021 06:08:58 -0700 (PDT) Received: by mail-qv1-xf29.google.com with SMTP id gv2so2305846qvb.8 for ; Thu, 15 Apr 2021 06:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Av9lBh4ytQJLZDgCvCumBBm678aTIHFLWXFB6bVJiGk=; b=MjHrmHj3CxKqGBd/wHR9VR1eOkob2QYJ9Aeq0rkN3vePFB+JTxwCpU8ycDTeFNwpUZ t7JcUD3aKSEM1MTXPKb7eliUDURUr0m7JkhZTnCQ+QggTWSHzPT15NLUiMoFRvLsvTcp MujH3kN7+0dHS3pvIhfruu731O3qCDMiNH5zLY0q+lHp1ki7z7UJTI8WYoNXe5gESNrA miDO6KrL0zb2AMzSf7cG2g17pL+kj6Eri7EWR9XKqg7rc8sYsyIyaJqwnbH4fHuYzuN8 yDLUup0nMkjt6ALnPeExIWExt0Y+B/bNa/A44hKD/B09wIPf27z3NhhTXp+IX7XC5SYl WH1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Av9lBh4ytQJLZDgCvCumBBm678aTIHFLWXFB6bVJiGk=; b=BTnD1jVa34Kg55tqfc2Lqbbx5pGgOQJscZAe67WuoAzzF0FggozHO4ZbdJV7WfYLLN qlR9joANdKAlOgi6pLSqsKA8V170EYES6hXFIxtsLOpG+JxgFQhkPLbVmzjatKPLsCgg My21vgNHg2kjFYL3Ndd84t+/tOlAdbHpo+iexFZ6vbrplQHv1xzV8HjCtILjn5KniJZT ecLsh3UEXEJOpA/HRk3uUnvlFH/mrp50lofzytOt+4NobpoDKqtw73b7k3eyn2W5lQsz JZu29uPU6eQ+7Nfji/cPFjNlPSlNsndROwUoysamfYbvF07WcfuYVBUYCtGL7IthmwWk giyA== X-Gm-Message-State: AOAM532kOkF7MCiK5QxSp1SDD4L1m7pWhyHy1SWWXkeU5MIDPEoR/19I 9F172Pv9Df+aVpK34p0cK9qPIQ== X-Google-Smtp-Source: ABdhPJwBZbvTOtQ7JrjyHedhunLhY1PtV+CdCC/35yHj+3yXUnmSXDK4vTITiMNWCEVv9JExSNyNAg== X-Received: by 2002:a05:6214:4b0:: with SMTP id w16mr2924175qvz.54.1618492137741; Thu, 15 Apr 2021 06:08:57 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-142-162-115-133.dhcp-dynamic.fibreop.ns.bellaliant.net. [142.162.115.133]) by smtp.gmail.com with ESMTPSA id l24sm1755539qtp.18.2021.04.15.06.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 06:08:56 -0700 (PDT) Received: from jgg by mlx with local (Exim 4.94) (envelope-from ) id 1lX1jr-006k2Q-Q4; Thu, 15 Apr 2021 10:08:55 -0300 Date: Thu, 15 Apr 2021 10:08:55 -0300 From: Jason Gunthorpe To: Stephen Rothwell Cc: Alex Williamson , 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: <20210415130855.GR227011@ziepe.ca> References: <20210415164734.1143f20d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210415164734.1143f20d@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Jason