On Wed, 26 Jul 2023 10:35:06 -0300
Jason Gunthorpe <jgg@xxxxxxxxxx> wrote:
> On Tue, Jul 25, 2023 at 02:40:18PM -0700, Brett Creeley wrote:
>
> > Note: This series is based on the latest linux-next tree. I did not base
> > it on the Alex Williamson's vfio/next because it has not yet pulled in
> > the latest changes which include the pds_vdpa driver. The pds_vdpa
> > driver has conflicts with the pds-vfio-pci driver that needed to be
> > resolved, which is why this series is based on the latest linux-next
> > tree.
>
> This is not the right way to handle this, Alex cannot apply a series
> against linux-next.
>
> If you can't make a shared branch and the conflicts are too
> significant to forward to Linus then you have to wait for the next
> cycle.
Brett, can you elaborate on what's missing from my next branch vs
linux-next?
AFAICT the pds_vdpa driver went into mainline via a8d70602b186 ("Merge
tag 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") during the
v6.5 merge window and I'm not spotting anything in linux-next obviously
relevant to pds-vfio-pci since then.
There's a debugfs fix on the list, but that's sufficiently trivial to
fixup on merge if necessary. This series also applies cleanly vs my
current next branch. Was the issue simply that I hadn't updated my
next branch (done yesterday) since the v6.5 merge window? You can
always send patches vs mainline. Thanks,
Alex
