Messages in this thread | | | Subject | Re: linux-next: manual merge of the block tree with the rdma tree | From | Max Gurtovoy <> | Date | Tue, 2 Jun 2020 11:37:26 +0300 |
| |
On 6/2/2020 5:56 AM, Stephen Rothwell wrote: > Hi all,
Hi,
This looks good to me.
Can you share a pointer to the tree so we'll test it in our labs ?
need to re-test:
1. srq per core
2. srq per core + T10-PI
And both will run with shared CQ.
> > Today's linux-next merge of the block tree got a conflict in: > > drivers/nvme/target/rdma.c > > between commit: > > 5733111dcd97 ("nvmet-rdma: use new shared CQ mechanism") > > from the rdma tree and commits: > > b0012dd39715 ("nvmet-rdma: use SRQ per completion vector") > b09160c3996c ("nvmet-rdma: add metadata/T10-PI support") > > from the block tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. >
| |