On Wed, Sep 9, 2020 at 2:28 AM Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
On Wed, Sep 9, 2020 at 11:27 AM Daniel Vetter <daniel@xxxxxxxx> wrote:
>
> On Wed, Sep 09, 2020 at 09:13:11AM +0200, Miklos Szeredi wrote:
> > On Wed, Sep 9, 2020 at 9:04 AM Gerd Hoffmann <kraxel@xxxxxxxxxx> wrote:
> > >
> > > On Wed, Sep 02, 2020 at 05:00:25PM -0700, Gurchetan Singh wrote:
> > > > On Wed, Sep 2, 2020 at 3:15 PM Vivek Goyal <vgoyal@xxxxxxxxxx> wrote:
> > > >
> > > > > Hi Gurchetan,
> > > > >
> > > > > Now Miklos has queued, these tree virtio patches for shared memory
> > > > > region in his tree as part of virtiofs dax patch series.
> > > > >
> > > > > I am hoping this will get merged in 5.10 through his tree.
> > > > >
> > > > >
> > > > > https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git/log/?h=dax
> > > >
> > > >
> > > > Terrific ... ! Maybe we can queue the version Miklos has in drm-misc-next
> > > > to avoid merge conflicts ?!?
> > >
> > > I guess it would either be merging the fuse tree into drm-misc-next,
> > > or cherry-picking the three virtio shm patches from the fuse tree.
> >
> > Maybe cleanest if we'd do a separate branch for the virtio patches and
> > pull that into both the fuse-next and the drm-misc-next trees?
>
> +1
>
> If the trees are more closely related (e.g. drm and v4l or so) then
> occasionally we just merge patches into one tree with acks from all the
> other maintainers. But topic branch for the common bits feels better here.
>
> Please send the topic pull request to drm-misc maintainers (Maarten,
> Maxime, Thomas) so they can pull it in.
That sounds like an excellent plan !
I will send out blob v3 (incorporating kraxel@'s feedback) once the topic pull request (it seems Miklos will do this?) for the shm region patches has been merged into drm-misc-next.
Works better when I add them :-)
-Daniel
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
