[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20201205153632.0f588404@kicinski-fedora-pc1c0hjn.DHCP.thefacebook.com>
Date: Sat, 5 Dec 2020 15:36:32 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: Jason Gunthorpe <jgg@...dia.com>
Cc: Saeed Mahameed <saeedm@...dia.com>, <netdev@...r.kernel.org>,
<linux-rdma@...r.kernel.org>,
"David S. Miller" <davem@...emloft.net>,
Leon Romanovsky <leonro@...dia.com>,
Dave Ertman <david.m.ertman@...el.com>,
Dan Williams <dan.j.williams@...el.com>
Subject: Re: [pull request][for-next] mlx5-next auxbus support
On Fri, 4 Dec 2020 20:26:42 -0400 Jason Gunthorpe wrote:
> Jakub a few notes on shared branch process here..
>
> In general Linus's advice has been to avoid unnecessary merges so
> Saeed/Leon have tended to send PRs to one tree or the other based on
> need and that PR might have a "catch up" from the other tree. I guess
> this one is special because it makes lots of changes in both trees.
>
> Whoever pulls first means the other cannot refuse the PR, so I usually
> prefer to let netdev go first. I have more BW to manage trouble on the
> RDMA side..
>
> I saw your other request related to the CI failures due to the wrong
> branch basis in the build bot. This means you will need to pull every
> update to the mlx5 shared branch, even if it is not immediately
> relevant to netdev, or have Saeed include the 'base commit' trailer
> and teach the build bots to respect it..
>
> Also, I arrange the RDMA merge window PR to be after netdev (usually
> on Thursday) so that Linus sees minor RDMA stuff in the netdev
> diffstat, and almost no netdev stuff in the RDMA PR.
Makes sense, thanks for the notes.
Powered by blists - more mailing lists