From: "Michael S. Tsirkin" <mst@redhat.com>
To: Eli Cohen <eli@mellanox.com>
Cc: shahafs@mellanox.com, parav@mellanox.com,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, saeedm@mellanox.com
Subject: Re: [PATCH V4 linux-next 00/12] VDPA support for Mellanox ConnectX devices
Date: Wed, 5 Aug 2020 09:12:58 -0400 [thread overview]
Message-ID: <20200805090304-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20200805130158.GA126406@mtl-vdi-166.wap.labs.mlnx>
On Wed, Aug 05, 2020 at 04:01:58PM +0300, Eli Cohen wrote:
> On Wed, Aug 05, 2020 at 08:48:52AM -0400, Michael S. Tsirkin wrote:
> > >
> > > Did you merge this?:
> > > git pull git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next
> >
> >
> > I can only merge this tree if no one else will. Linus does not like
> > getting same patches through two trees.
> >
> > Is this the case? Is mlx5-next going to be merged through
> > my tree in this cycle?
> >
>
> Saeed Mahameed from Mellanox (located in California) usuaally sends out
> net patches. So he's supposed to send that to Dave Miller.
>
> I think Saeed should answer this. Let's wait a few more hours till he
> wakes up.
Alternatives:
- merge vdpa through Saeed's tree. I can ack that, we'll need to
resolve any conflicts by merging the two trees and show the
result to Linus so he can resolve the merge in the same way.
- extract just the necessary patches that are needed for vdpa and
merge through my tree.
- if Saeed sends his pull today, it's likely it will be merged
early next week. Then I can rebase and send a pull with your patches
on top. A bit risky.
- do some tricks with build. E.g. disable build of your code,
and enable in Saeed's tree when everything is merged together.
Can be somewhat hard.
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2020-08-05 13:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200804162048.22587-1-eli@mellanox.com>
2020-08-04 21:29 ` [PATCH V4 linux-next 00/12] VDPA support for Mellanox ConnectX devices Michael S. Tsirkin
[not found] ` <20200805050105.GA5442@nps-server-21.mtl.labs.mlnx>
2020-08-05 8:12 ` Jason Wang
[not found] ` <20200804162048.22587-13-eli@mellanox.com>
2020-08-05 8:09 ` [PATCH V4 linux-next 12/12] vdpa/mlx5: Add VDPA driver for supported mlx5 devices Jason Wang
[not found] ` <20200804162048.22587-9-eli@mellanox.com>
2020-08-05 8:10 ` [PATCH V4 linux-next 08/12] vdpa: Modify get_vq_state() to return error code Jason Wang
2020-08-05 8:11 ` [PATCH V4 linux-next 00/12] VDPA support for Mellanox ConnectX devices Jason Wang
2020-08-05 12:00 ` Michael S. Tsirkin
[not found] ` <20200805124054.GA125576@mtl-vdi-166.wap.labs.mlnx>
2020-08-05 12:48 ` Michael S. Tsirkin
[not found] ` <20200805130158.GA126406@mtl-vdi-166.wap.labs.mlnx>
2020-08-05 13:12 ` Michael S. Tsirkin [this message]
2020-08-05 19:01 ` Saeed Mahameed
2020-08-05 19:46 ` Jason Gunthorpe
2020-08-05 22:31 ` Michael S. Tsirkin
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=20200805090304-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=eli@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=parav@mellanox.com \
--cc=saeedm@mellanox.com \
--cc=shahafs@mellanox.com \
--cc=virtualization@lists.linux-foundation.org \
/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).