Re: linux-next: manual merge of the block tree with the rdma tree

On 6/3/2020 2:32 AM, Jason Gunthorpe wrote: On Wed, Jun 03, 2020 at 01:40:51AM +0300, Max Gurtovoy wrote: On 6/3/2020 12:37 AM, Jens Axboe wrote: On 6/2/20 1:09 PM, Jason Gunthorpe wrote: On Tue, Jun 02, 2020 at 01:02:55PM -0600, Jens Axboe wrote: On 6/2/20 1:01 PM, Jason Gunthorpe wrote:

Re: linux-next: manual merge of the block tree with the rdma tree

On Wed, Jun 03, 2020 at 01:40:51AM +0300, Max Gurtovoy wrote: > > On 6/3/2020 12:37 AM, Jens Axboe wrote: > > On 6/2/20 1:09 PM, Jason Gunthorpe wrote: > > > On Tue, Jun 02, 2020 at 01:02:55PM -0600, Jens Axboe wrote: > > > > On 6/2/20 1:01 PM, Jason Gunthorpe wrote: > > > > > On Tue, Jun 02,

Re: linux-next: manual merge of the block tree with the rdma tree

On 6/3/2020 12:37 AM, Jens Axboe wrote: On 6/2/20 1:09 PM, Jason Gunthorpe wrote: On Tue, Jun 02, 2020 at 01:02:55PM -0600, Jens Axboe wrote: On 6/2/20 1:01 PM, Jason Gunthorpe wrote: On Tue, Jun 02, 2020 at 11:37:26AM +0300, Max Gurtovoy wrote: On 6/2/2020 5:56 AM, Stephen Rothwell wrote:

Re: linux-next: manual merge of the block tree with the rdma tree

On 6/2/20 1:09 PM, Jason Gunthorpe wrote: > On Tue, Jun 02, 2020 at 01:02:55PM -0600, Jens Axboe wrote: >> On 6/2/20 1:01 PM, Jason Gunthorpe wrote: >>> On Tue, Jun 02, 2020 at 11:37:26AM +0300, Max Gurtovoy wrote: On 6/2/2020 5:56 AM, Stephen Rothwell wrote: > Hi all, Hi,

Re: linux-next: manual merge of the block tree with the rdma tree

On Tue, Jun 02, 2020 at 01:02:55PM -0600, Jens Axboe wrote: > On 6/2/20 1:01 PM, Jason Gunthorpe wrote: > > On Tue, Jun 02, 2020 at 11:37:26AM +0300, Max Gurtovoy wrote: > >> > >> On 6/2/2020 5:56 AM, Stephen Rothwell wrote: > >>> Hi all, > >> > >> Hi, > >> > >> This looks good to me. > >> > >>

Re: linux-next: manual merge of the block tree with the rdma tree

On Tue, Jun 02, 2020 at 11:37:26AM +0300, Max Gurtovoy wrote: > > 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 +

Re: linux-next: manual merge of the block tree with the rdma tree

On 6/2/20 1:01 PM, Jason Gunthorpe wrote: > On Tue, Jun 02, 2020 at 11:37:26AM +0300, Max Gurtovoy wrote: >> >> 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: linux-next: manual merge of the block tree with the rdma tree

Hi Max, On Tue, 2 Jun 2020 11:37:26 +0300 Max Gurtovoy wrote: > > On 6/2/2020 5:56 AM, Stephen Rothwell wrote: > > This looks good to me. > > Can you share a pointer to the tree so we'll test it in our labs ? git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git you want tag

Re: linux-next: manual merge of the block tree with the rdma tree

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

linux-next: manual merge of the block tree with the rdma tree

Hi all, 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

linux-next: manual merge of the block tree with the rdma tree

Hi all, Today's linux-next merge of the block tree got a conflict in: drivers/nvme/host/rdma.c between commit: 583f69304b91 ("nvme-rdma: use new shared CQ mechanism") from the rdma tree and commit: 5ec5d3bddc6b ("nvme-rdma: add metadata/T10-PI support") from the block tree. I fixed

Re: linux-next: manual merge of the block tree with the rdma tree

On Wed, Aug 15, 2018 at 11:45:39AM +1000, Stephen Rothwell wrote: > Hi all, > > On Thu, 26 Jul 2018 13:58:04 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the block tree got a conflict in: > > > > drivers/nvme/target/rdma.c > > > > between commit: > > > >

Re: linux-next: manual merge of the block tree with the rdma tree

On Wed, Aug 15, 2018 at 11:45:39AM +1000, Stephen Rothwell wrote: > Hi all, > > On Thu, 26 Jul 2018 13:58:04 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the block tree got a conflict in: > > > > drivers/nvme/target/rdma.c > > > > between commit: > > > >

Re: linux-next: manual merge of the block tree with the rdma tree

Hi all, On Thu, 26 Jul 2018 13:58:04 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the block tree got a conflict in: > > drivers/nvme/target/rdma.c > > between commit: > > 23f96d1f15a7 ("nvmet-rdma: Simplify ib_post_(send|recv|srq_recv)() calls") > 202093848cac

Re: linux-next: manual merge of the block tree with the rdma tree

Hi all, On Thu, 26 Jul 2018 13:58:04 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the block tree got a conflict in: > > drivers/nvme/target/rdma.c > > between commit: > > 23f96d1f15a7 ("nvmet-rdma: Simplify ib_post_(send|recv|srq_recv)() calls") > 202093848cac

linux-next: manual merge of the block tree with the rdma tree

Hi all, Today's linux-next merge of the block tree got a conflict in: drivers/nvme/target/rdma.c between commit: 23f96d1f15a7 ("nvmet-rdma: Simplify ib_post_(send|recv|srq_recv)() calls") 202093848cac ("nvmet-rdma: add an error flow for post_recv failures") from the rdma tree and

linux-next: manual merge of the block tree with the rdma tree

Hi all, Today's linux-next merge of the block tree got a conflict in: drivers/nvme/target/rdma.c between commit: 23f96d1f15a7 ("nvmet-rdma: Simplify ib_post_(send|recv|srq_recv)() calls") 202093848cac ("nvmet-rdma: add an error flow for post_recv failures") from the rdma tree and