From: Alex Williamson <alex.williamson@redhat.com>
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
Jani Nikula <jani.nikula@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: linux-next: manual merge of the vfio tree with the drm tree
Date: Thu, 15 Apr 2021 13:20:29 -0600 [thread overview]
Message-ID: <20210415132029.3055578b@redhat.com> (raw)
In-Reply-To: <20210415130855.GR227011@ziepe.ca>
On Thu, 15 Apr 2021 10:08:55 -0300
Jason Gunthorpe <jgg@ziepe.ca> 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
next prev parent reply other threads:[~2021-04-15 19:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 6:47 linux-next: manual merge of the vfio tree with the drm tree Stephen Rothwell
2021-04-15 13:08 ` Jason Gunthorpe
2021-04-15 19:20 ` Alex Williamson [this message]
2021-08-27 6:55 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210415132029.3055578b@redhat.com \
--to=alex.williamson@redhat.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).