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@xxxxxxxxxx> 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. Thanks
