[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220908105345.28da7c98.alex.williamson@redhat.com>
Date: Thu, 8 Sep 2022 10:53:45 -0600
From: Alex Williamson <alex.williamson@...hat.com>
To: Leon Romanovsky <leon@...nel.org>
Cc: saeedm@...dia.com, kvm@...r.kernel.org, netdev@...r.kernel.org,
kuba@...nel.org, kevin.tian@...el.com, joao.m.martins@...cle.com,
yishaih@...dia.com, maorg@...dia.com, cohuck@...hat.com
Subject: Re: [GIT PULL] Please pull mlx5 vfio changes
On Thu, 8 Sep 2022 09:31:13 +0300
Leon Romanovsky <leon@...nel.org> wrote:
> On Wed, Sep 07, 2022 at 01:21:19PM -0600, Alex Williamson wrote:
> > On Wed, 7 Sep 2022 12:43:44 +0300
> > Leon Romanovsky <leon@...nel.org> wrote:
> >
> > > Hi Alex,
> > >
> > > This series is based on clean 6.0-rc4 as such it causes to two small merge
> > > conficts whis vfio-next. One is in thrird patch where you should take whole
> > > chunk for include/uapi/linux/vfio.h as is. Another is in vfio_main.c around
> > > header includes, which you should take too.
> >
> > Is there any reason you can't provide a topic branch for the two
> > net/mlx5 patches and the remainder are rebased and committed through
> > the vfio tree?
>
> You added your Acked-by to vfio/mlx5 patches and for me it is a sign to
> prepare clean PR with whole series.
>
> I reset mlx5-vfio topic to have only two net/mlx5 commits without
> special tag.
>
> https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git topic/mlx5-vfio
> Everything else can go directly to your tree without my intervention.
Sorry, I knew the intention initially was to send a PR and I didn't
think about the conflicts we'd have versus the base you'd use. Thanks
for splitting this out, I think it'll make for a cleaner upstream path
given the clear code split.
Yishai, can you post a v7 rebased on the vfio next branch? The comment
I requested is now ephemeral since it only existed in the commits Leon
dropped. Also feel free to drop my Acks since I'll add new Sign-offs.
Thanks,
Alex
Powered by blists - more mailing lists