From: Alex Williamson <alex.williamson@redhat.com>
To: Jason Gunthorpe <jgg@nvidia.com>
Cc: Brett Creeley <brett.creeley@amd.com>,
kvm@vger.kernel.org, netdev@vger.kernel.org, yishaih@nvidia.com,
shameerali.kolothum.thodi@huawei.com, kevin.tian@intel.com,
simon.horman@corigine.com, shannon.nelson@amd.com
Subject: Re: [PATCH v13 vfio 0/7] pds-vfio-pci driver
Date: Wed, 26 Jul 2023 12:50:51 -0600 [thread overview]
Message-ID: <20230726125051.424ed592.alex.williamson@redhat.com> (raw)
In-Reply-To: <ZMEhCrZDNLSrWP/5@nvidia.com>
On Wed, 26 Jul 2023 10:35:06 -0300
Jason Gunthorpe <jgg@nvidia.com> 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
next prev parent reply other threads:[~2023-07-26 18:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 21:40 [PATCH v13 vfio 0/7] pds-vfio-pci driver Brett Creeley
2023-07-25 21:40 ` [PATCH v13 vfio 1/7] vfio: Commonize combine_ranges for use in other VFIO drivers Brett Creeley
2023-08-04 16:51 ` Jason Gunthorpe
2023-07-25 21:40 ` [PATCH v13 vfio 2/7] vfio/pds: Initial support for pds VFIO driver Brett Creeley
2023-07-25 21:40 ` [PATCH v13 vfio 3/7] vfio/pds: register with the pds_core PF Brett Creeley
2023-07-31 20:57 ` Alex Williamson
2023-08-01 15:44 ` Brett Creeley
2023-08-04 17:03 ` Jason Gunthorpe
2023-08-04 17:23 ` Brett Creeley
2023-08-04 19:21 ` Brett Creeley
2023-08-04 22:42 ` Jason Gunthorpe
2023-08-07 17:28 ` Brett Creeley
2023-07-25 21:40 ` [PATCH v13 vfio 4/7] vfio/pds: Add VFIO live migration support Brett Creeley
2023-07-25 21:40 ` [PATCH v13 vfio 5/7] vfio/pds: Add support for dirty page tracking Brett Creeley
2023-08-03 12:43 ` Shameerali Kolothum Thodi
2023-08-03 19:53 ` Brett Creeley
2023-07-25 21:40 ` [PATCH v13 vfio 6/7] vfio/pds: Add support for firmware recovery Brett Creeley
2023-08-04 17:18 ` Jason Gunthorpe
2023-08-04 17:34 ` Brett Creeley
2023-08-04 18:03 ` Jason Gunthorpe
2023-08-04 18:50 ` Brett Creeley
2023-08-10 3:46 ` Tian, Kevin
2023-07-25 21:40 ` [PATCH v13 vfio 7/7] vfio/pds: Add Kconfig and documentation Brett Creeley
2023-07-26 13:35 ` [PATCH v13 vfio 0/7] pds-vfio-pci driver Jason Gunthorpe
2023-07-26 18:50 ` Alex Williamson [this message]
2023-07-26 19:05 ` Brett Creeley
2023-07-26 19:25 ` Alex Williamson
2023-08-03 8:28 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230726125051.424ed592.alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=brett.creeley@amd.com \
--cc=jgg@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=shannon.nelson@amd.com \
--cc=simon.horman@corigine.com \
--cc=yishaih@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).