From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jason Gunthorpe <jgg@mellanox.com>
Cc: Shahaf Shuler <shahafs@mellanox.com>,
Parav Pandit <parav@mellanox.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
Saeed Mahameed <saeedm@mellanox.com>,
Eli Cohen <eli@mellanox.com>
Subject: Re: [PATCH V4 linux-next 00/12] VDPA support for Mellanox ConnectX devices
Date: Wed, 5 Aug 2020 18:31:01 -0400 [thread overview]
Message-ID: <20200805183017-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20200805194646.GJ19097@mellanox.com>
On Wed, Aug 05, 2020 at 04:46:46PM -0300, Jason Gunthorpe wrote:
> On Wed, Aug 05, 2020 at 07:01:52PM +0000, Saeed Mahameed wrote:
> > On Wed, 2020-08-05 at 09:12 -0400, Michael S. Tsirkin wrote:
> > > 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.gi
> > > > > > t mlx5-next
> > > > >
> > > > > I can only merge this tree if no one else will. Linus does not
> > > > > like getting same patches through two trees.
>
> This is not quite the case
>
> Linus does not like multiple *copies* of the same patches. The same
> actual git commits can be OK.
>
> Linus also does not like unnecessarily cross linking trees, mlx5-next
> is designed to be small enough and approved enough that it is not
> controversial.
>
> Linus really doesn't like it when people jams stuff together in rc7 or
> the weeks of the merge window. He wants to see stuff be in linux-next
> for at least a bit. So it may be too late regardless.
I'll try, let's see what happens.
> > We do this all the time with net-next and rdma,
> > mlx5-next is a very small branch based on a very early rc that includes
> > mlx5 shared stuff between rdma and net-next, and now virtio as well.
>
> Yes, going on two years now? Been working well
>
> Jason
OK, I'll merge it then. Thanks!
--
MST
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
prev parent reply other threads:[~2020-08-05 22:31 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
2020-08-05 19:01 ` Saeed Mahameed
2020-08-05 19:46 ` Jason Gunthorpe
2020-08-05 22:31 ` Michael S. Tsirkin [this message]
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=20200805183017-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=eli@mellanox.com \
--cc=jgg@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).