linux-kernel - Re: linux-next: manual merge of the vfio tree with the drm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210415132029.3055578b@redhat.com>
Date:   Thu, 15 Apr 2021 13:20:29 -0600
From:   Alex Williamson <alex.williamson@...hat.com>
To:     Jason Gunthorpe <jgg@...pe.ca>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Jani Nikula <jani.nikula@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Thomas Zimmermann <tzimmermann@...e.de>
Subject: Re: linux-next: manual merge of the vfio tree with the drm tree

On Thu, 15 Apr 2021 10:08:55 -0300
Jason Gunthorpe <jgg@...pe.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